Add MIT license for framework (./system), add docs

3 files changed, 21 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f5559858cdf..a0a6b9f96464 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = filebin
 	pkgdesc = A pastebin service written in PHP
 	pkgver = 3.4.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.server-speed.net/projects/filebin
 	install = filebin.install
 	arch = any
 	license = AGPL
+	license = MIT
 	makedepends = nodejs
 	makedepends = git
 	depends = php
diff --git a/PKGBUILD b/PKGBUILD
index a9a2a09e5d7a..c4a81759fb9a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: Simon Hanna<simon DOT Hanna AT serve-me DOT info>
 pkgname=filebin
 pkgver=3.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A pastebin service written in PHP"
 arch=('any')
 url="https://wiki.server-speed.net/projects/filebin"
-license=('AGPL')
+license=('AGPL' 'MIT')
 makedepends=('nodejs' 'git')
 depends=('php'
          'pygmentize'
@@ -62,8 +62,6 @@ build () {
 }
 
 package() {
-  install -Dm644 "${srcdir}/${pkgname}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-
   install -D -d -m755 "${pkgdir}/usr/lib/systemd/system"
   install -D -d -m755 -g 33 "${pkgdir}/usr/share/webapps/filebin" "${pkgdir}/etc/webapps/filebin"
   install -D -d -m755 -o 33 -g 33 "${pkgdir}/usr/share/webapps/filebin/data/uploads"
@@ -72,13 +70,26 @@ package() {
   install -m640 -g 33 "${srcdir}/${pkgname}/application/config/example/database.php" "${pkgdir}/etc/webapps/filebin"
   install -m640 -g 33 "${srcdir}/${pkgname}/application/config/example/memcached.php" "${pkgdir}/etc/webapps/filebin"
   install -m644 filebin-file-cron.service filebin-file-cron.timer filebin-user-cron.service filebin-user-cron.timer "${pkgdir}/usr/lib/systemd/system"
-  install -m644 filebin-nginx.conf filebin-php-fpm.conf "${pkgdir}/usr/share/webapps/filebin"
   cp -r "${srcdir}/${pkgname}"/* "${pkgdir}/usr/share/webapps/filebin/"
   rm "${pkgdir}/usr/share/webapps/filebin/application/config/memcached.php"
   ln -s /etc/webapps/filebin/{config-local,database,memcached}.php "${pkgdir}/usr/share/webapps/filebin/application/config"
   ln -s /etc/webapps/filebin/contact-info.php "${pkgdir}/usr/share/webapps/filebin/data/local"
 
+  install -Dm644 "${srcdir}/${pkgname}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -Dm644 "${srcdir}/${pkgname}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/framework-license.txt"
+
+  install -Dm644 filebin-nginx.conf "$pkgdir/usr/share/doc/$pkgname/examples/nginx.conf"
+  install -Dm644 filebin-php-fpm.conf "$pkgdir/usr/share/doc/$pkgname/examples/php-fpm.conf"
+  install -Dm644 "${srcdir}/${pkgname}/NEWS" "$pkgdir/usr/share/doc/$pkgname/NEWS"
+  install -Dm644 "${srcdir}/${pkgname}/README.md" "$pkgdir/usr/share/doc/$pkgname/README.md"
+  install -Dm644 "${srcdir}/${pkgname}/contributing.md" "$pkgdir/usr/share/doc/$pkgname/contributing.md"
+  install -Dm644 "${srcdir}/${pkgname}/INSTALL" "$pkgdir/usr/share/doc/$pkgname/INSTALL"
+  install -Dm644 "${srcdir}/${pkgname}/doc/api.md" "$pkgdir/usr/share/doc/$pkgname/api.md"
+  install -Dm644 "${srcdir}/${pkgname}/doc/api/file.md" "$pkgdir/usr/share/doc/$pkgname/api/file.md"
+  install -Dm644 "${srcdir}/${pkgname}/doc/api/user.md" "$pkgdir/usr/share/doc/$pkgname/api/user.md"
+  rm -Rf "${pkgdir}/usr/share/webapps/filebin/"{COPYING,license.txt,NEWS,README.md,contributing.md,INSTALL,doc}
+
   # removing unnecessary data for a production environment
-  rm -rf "${pkgdir}/usr/share/webapps/filebin/"{git-hooks,application/third_party/test-more-php,application/third_party/mockery,application/tests,scripts/optimize_js.sh,scripts/install-git-hooks.sh,scripts/hooks-wrapper.sh}
+  rm -Rf "${pkgdir}/usr/share/webapps/filebin/"{Dockerfile,docker,composer.json,composer.lock,git-hooks,run-tests.sh,data/tests,application/third_party/test-more-php,application/third_party/mockery,application/tests,scripts/optimize_js.sh,scripts/install-git-hooks.sh,scripts/hooks-wrapper.sh}
   find "${pkgdir}/usr/share/webapps/filebin" -name ".git*" -type f -delete
 }
diff --git a/filebin.install b/filebin.install
index fd6569dca78d..62f7c5f05aee 100644
--- a/filebin.install
+++ b/filebin.install
@@ -8,9 +8,9 @@ post_install() {
 	echo "Run 'php /usr/share/webapps/filebin/index.php tools update_database' to initialize your database."
 	echo "Run 'php /usr/share/webapps/filebin/index.php user add_user' to add your first user."
 
-	echo "Additional information can be found in '/usr/share/webapps/filebin/INSTALL'."
+	echo "Additional information can be found in '/usr/share/doc/filebin'."
         echo ""
-	echo "For nginx and php-fpm there are sample configuration files in '/usr/share/webapps/filebin'."
+	echo "For nginx and php-fpm there are sample configuration files in '/usr/share/doc/filebin/examples'."
         echo ""
 	echo "Additionally you should enable 'filebin-user-cron.timer' and 'filebin-user-cron.timer'."
 	echo "-------------------------------------------------------------------------------"