From 6c4bea5606848d7c2c8362d81837cf369fc913bb Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Wed, 6 Dec 2017 07:54:22 +0000 Subject: non-free/unifi: slight improvements - Add a name for init - Allow daemon's user override - Allow passing additional options to daemon - Add robots.txt - Use copytruncate for log rotation so daemon isn't restarted - Augment log history --- non-free/unifi/APKBUILD | 14 ++++++++++---- non-free/unifi/unifi.confd | 2 ++ non-free/unifi/unifi.initd | 5 +++-- non-free/unifi/unifi.logrotated | 9 +++------ 4 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 non-free/unifi/unifi.confd (limited to 'non-free') diff --git a/non-free/unifi/APKBUILD b/non-free/unifi/APKBUILD index 07a05ea961..76aad98f87 100644 --- a/non-free/unifi/APKBUILD +++ b/non-free/unifi/APKBUILD @@ -3,7 +3,7 @@ pkgname=unifi _pkgname=UniFi pkgver=5.6.22 -pkgrel=0 +pkgrel=1 pkgdesc="The Ubiquiti UniFi network controller" url="http://wiki.ubnt.com/UniFi_FAQ" arch="noarch" @@ -16,6 +16,7 @@ options="!check !fhs" subpackages="$pkgname-doc" source="$pkgname-$pkgver.zip::https://dl.ubnt.com/$pkgname/$pkgver/$_pkgname.unix.zip $pkgname.initd + $pkgname.confd $pkgname.logrotated " builddir="$srcdir/$_pkgname" @@ -40,6 +41,8 @@ package() { "$pkgdir"/etc/logrotate.d/$pkgname install -Dm755 "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.confd \ + "$pkgdir"/etc/conf.d/$pkgname install -Dm644 readme.txt \ "$pkgdir"/usr/share/doc/$pkgname/readme.txt @@ -61,14 +64,17 @@ package() { ln -sf /var/lib/$pkgname/data $basedir/data ln -sf /var/lib/$pkgname/work $basedir/work - # overwrite with local snappy ln -sf /usr/share/java/snappy-java-1.1.2.6.jar \ "$basedir"/lib/snappy-java-1.1.2.6.jar # make sure datadir is writable by our user chown -R $pkgname:$pkgname $datadir + + # tell search engines to do not index + echo -e "User-Agent:*\nDisallow:/" > "$webapps"/$pkgname/ROOT/robots.txt } sha512sums="5fa9f0b6904c61b13e1c2430c0244404797795c119323eec61c296e6412184a114389d3db62e4d70e274d972768e030c8436820f2c20ac23767d145e8f8fedcc unifi-5.6.22.zip -d0f5a6fe23e4d9e24f0beb7b8c1d19be99ebc27784457a802f49c4d0f1b3182a0d22f820a289a728db93d65fcb0b46397dc7cd57f793c9b48bbc876f97250423 unifi.initd -c4293d5908b7a843044c9f9645232c7a385f92384eb52b040039ead1cbc4f8902e7276ac9650b2842d8014ce06cdd1de445a55c84d80dcf994626fbf356bdf65 unifi.logrotated" +b19a7d684ef2ec7c4159417c21185ccd8ce498da25405b69014fdb32e346a0077f7edc5dfc994481d12936aa8dbf22e6baf29571fd0003aaad19609d24c549f4 unifi.initd +d339555a91de7488badbedf8a4c85cff878e7d0720a8cf6a8340f51f3666dcf4878b47a1fff4c9c2846d7af140d11e48e898f8c4dba1f81c1004b76a81f0821e unifi.confd +9e54d9e1c720b8e50c9af9363105f6ea9ff2cffff7dc67477a7701aacf21ba977424fe9fbaba6a00d5f64310a2e2517e9328a7acb91a4bc06ed237139a8e0d9b unifi.logrotated" diff --git a/non-free/unifi/unifi.confd b/non-free/unifi/unifi.confd new file mode 100644 index 0000000000..7c90a6fb80 --- /dev/null +++ b/non-free/unifi/unifi.confd @@ -0,0 +1,2 @@ +# Additional cmdline options to pass to java interpreter +# OPTS="-debug" diff --git a/non-free/unifi/unifi.initd b/non-free/unifi/unifi.initd index bfb0d84229..802f85b7b7 100644 --- a/non-free/unifi/unifi.initd +++ b/non-free/unifi/unifi.initd @@ -1,9 +1,10 @@ #!/sbin/openrc-run +name="Unifi Controller" supervisor=supervise-daemon command=/usr/bin/java -command_args="-jar lib/ace.jar start" -command_user="unifi" +command_args="-jar lib/ace.jar start ${OPTS}" +: ${command_user="unifi"} pidfile=/run/unifi/${RC_SVCNAME}.pid command_background=yes supervise_daemon_args="--chdir /usr/lib/unifi \ diff --git a/non-free/unifi/unifi.logrotated b/non-free/unifi/unifi.logrotated index 2e33dde9bb..28cc9ad437 100644 --- a/non-free/unifi/unifi.logrotated +++ b/non-free/unifi/unifi.logrotated @@ -1,11 +1,8 @@ /var/log/unifi/*.log { - daily - rotate 10 + weekly + rotate 5 missingok notifempty compress - sharedscripts - postrotate - /etc/init.d/unifi --ifstarted --quiet restart - endscript + copytruncate } -- cgit v1.2.3