[arch-commits] Commit in unifi/trunk (PKGBUILD unifi.install unifi.service)

[Sébastien Luttringer]

    Date: Friday, August 1, 2014 @ 02:33:59
  Author: seblu
Revision: 116654

Various improvments

- Move unifi from /opt to system hierachy
- Unzip the war archive to prevent write in /usr
- Use community site as $url
- Backup is no more needed
- Add readme file

Modified:
  unifi/trunk/PKGBUILD
  unifi/trunk/unifi.install
  unifi/trunk/unifi.service

---------------+
 PKGBUILD      |   43 +++++++++++++++++++++++++++++++++----------
 unifi.install |    2 +-
 unifi.service |    6 +++---
 3 files changed, 37 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-31 21:56:24 UTC (rev 116653)
+++ PKGBUILD	2014-08-01 00:33:59 UTC (rev 116654)
@@ -5,25 +5,48 @@
 pkgname=unifi
 pkgver=3.2.1
 pkgrel=1
-pkgdesc='Controller for Ubiquiti UniFi accesspoints'
+pkgdesc='Centralized management system for Ubiquiti UniFi AP'
 arch=('any')
-url='http://www.ubnt.com/'
-license=('custom')
+url='https://community.ubnt.com/unifi'
+license=('unknown')
 depends=('mongodb' 'jre7-openjdk-headless')
+makedepends=('jdk7-openjdk')
 conflicts=('tomcat-native')
-# needed to not break configuration accross upgrades
-backup=('opt/unifi/data/system.properties')
 install=unifi.install
 source=("UniFi-$pkgver.zip::http://dl.ubnt.com/unifi/$pkgver/UniFi.unix.zip"
         'unifi.service')
 md5sums=('9b2d59e6be25db2210f4d85512315e6f'
-         '04934ee4be43b6f80db610d140edf49f')
+         'a660012bdaa5c09a789e774514ae5c1e')
 
 package() {
-  install -d "$pkgdir/opt"
-  cp -ar UniFi "$pkgdir/opt/unifi"
-  chown -R 113:113 "$pkgdir/opt/unifi"
-  rm "$pkgdir/opt/unifi/readme.txt"
+  # lib
+  install -dm755 "$pkgdir/usr/lib/unifi"
+  cp -r UniFi/{bin,dl,lib,webapps} "$pkgdir/usr/lib/unifi"
+  # unjar
+  pushd "$pkgdir/usr/lib/unifi/webapps"
+  mkdir ROOT
+  cd ROOT
+  jar -xf ../ROOT.war
+  rm ../ROOT.war
+  popd
+
+  # data
+  install -dm750 "$pkgdir/var/lib/unifi"
+  for _d in data run work; do
+    install -dm750 "$pkgdir/var/lib/unifi/$_d"
+    ln -s "../../../var/lib/unifi/$_d" "$pkgdir/usr/lib/unifi/$_d"
+  done
+  chown -R 113:113 "$pkgdir/var/lib/unifi"
+
+  # log
+  install -dm750 "$pkgdir/var/log/unifi"
+  ln -s ../../../var/log/unifi "$pkgdir/usr/lib/unifi/logs"
+  chown -R 113:113 "$pkgdir/var/log/unifi"
+
+  # readme
+  install -Dm644 UniFi/readme.txt "$pkgdir/usr/share/doc/$pkgname/README"
+
+  # systemd
   install -Dm644 unifi.service "$pkgdir/usr/lib/systemd/system/unifi.service"
 }
 

Modified: unifi.install
===================================================================
--- unifi.install	2014-07-31 21:56:24 UTC (rev 116653)
+++ unifi.install	2014-08-01 00:33:59 UTC (rev 116654)
@@ -2,7 +2,7 @@
 post_install() {
   # https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database
   getent group unifi >/dev/null || groupadd -g 113 unifi
-  getent passwd unifi >/dev/null || useradd -M -d /opt/unifi -u 113 -g 113 unifi
+  getent passwd unifi >/dev/null || useradd -M -d /usr/lib/unifi -u 113 -g 113 unifi
   :
 }
 

Modified: unifi.service
===================================================================
--- unifi.service	2014-07-31 21:56:24 UTC (rev 116653)
+++ unifi.service	2014-08-01 00:33:59 UTC (rev 116654)
@@ -1,11 +1,11 @@
 [Unit]
-Description=UniFi Controller
+Description=Ubiquiti UniFi Server
 After=network.target
 
 [Service]
 User=unifi
-ExecStart=/usr/bin/java -jar /opt/unifi/lib/ace.jar start
-ExecStop=/usr/bin/java -jar /opt/unifi/lib/ace.jar stop
+ExecStart=/usr/bin/java -jar /usr/lib/unifi/lib/ace.jar start
+ExecStop=/usr/bin/java -jar /usr/lib/unifi/lib/ace.jar stop
 
 [Install]
 WantedBy=multi-user.target