First cleaning step

6 files changed, 48 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80a713ac270d..a9af90bc6f2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = librenms
-	pkgdesc = LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system.
+	pkgdesc = Autodiscovering PHP/MySQL-based network monitoring system.
 	pkgver = 1.37
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.librenms.org/
 	install = librenms.install
 	arch = any
@@ -24,10 +24,14 @@ pkgbase = librenms
 	backup = etc/webapps/librenms/config.php
 	source = https://github.com/librenms/librenms/archive/1.37.tar.gz
 	source = librenms.logrotate
+	source = librenms.sysusers
+	source = librenms.tmpfile
 	source = apache.example.conf
 	source = nginx.example.conf
 	sha256sums = 86dbcb2875c7bb4df8e042d9fc08e771cb60f6db55ba59259a14c6a8b6eaa281
 	sha256sums = 4189c171e4edb55ff11c80b313fed6ff4226ddb38f1e7c97e741e59e1c83afb8
+	sha256sums = b70ec2b7950719d6b502da52d983e1661c81da1494d423598f9043ce600f0399
+	sha256sums = ad83d03b8459e87ecd77f9ffebe56ccb9cc2dff1d52ce1151ef79a1e26653361
 	sha256sums = aed1a35b2d84f3b40e0d519ccdb56a5929896ae7cfedd3766f5df4b51fac3319
 	sha256sums = e1722c586e61e320c2382b2322150e176c61523dccb81eeec6c3d4618819110c
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6503733fdae3..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*
-!apache.example.conf
-!.gitignore
-!librenms.install
-!librenms.logrotate
-!nginx.example.conf
-!PKGBUILD
-!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index f72d104ace24..cb4a9fb72e96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Nils Czernia <nils[at]czserver[dot]de>
 pkgname=librenms
 pkgver=1.37
-pkgrel=1
-pkgdesc='LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system.'
+pkgrel=2
+pkgdesc='Autodiscovering PHP/MySQL-based network monitoring system.'
 arch=('any')
 url='http://www.librenms.org/'
 license=('GPLv3')
@@ -10,41 +10,51 @@ depends=('php' 'php-intl' 'php-gd' 'php-pear' 'net-snmp' 'graphviz' 'php-snmp' '
 backup=("etc/webapps/${pkgname}/config.php")
 source=("https://github.com/librenms/${pkgname}/archive/${pkgver}.tar.gz"
         "librenms.logrotate"
+		"librenms.sysusers"
+		"librenms.tmpfile"
         "apache.example.conf"
         "nginx.example.conf")
 install="librenms.install"
 sha256sums=('86dbcb2875c7bb4df8e042d9fc08e771cb60f6db55ba59259a14c6a8b6eaa281'
             '4189c171e4edb55ff11c80b313fed6ff4226ddb38f1e7c97e741e59e1c83afb8'
+            'b70ec2b7950719d6b502da52d983e1661c81da1494d423598f9043ce600f0399'
+            'ad83d03b8459e87ecd77f9ffebe56ccb9cc2dff1d52ce1151ef79a1e26653361'
             'aed1a35b2d84f3b40e0d519ccdb56a5929896ae7cfedd3766f5df4b51fac3319'
             'e1722c586e61e320c2382b2322150e176c61523dccb81eeec6c3d4618819110c')
-package() {
-   cd "$pkgdir"
-   install -dm0755 usr/share/webapps
-   install -dm0755 etc/webapps/${pkgname}
-   install -dm0755 etc/logrotate.d
-   install -dm0775 var/log/${pkgname}
 
-   cp -a "$srcdir"/${pkgname}-${pkgver} usr/share/webapps/${pkgname}
+prepare() {
+    cd "$srcdir"/${pkgname}-${pkgver}
+
+    sed -i 's/\/opt\/librenms/\/usr\/share\/webapps\/librenms/g' librenms.nonroot.cron
+    sed -i 's/\/opt\/librenms/\/usr\/share\/webapps\/librenms/g' librenms.cron
 
-   sed -i 's/\/opt\/librenms/\/usr\/share\/webapps\/librenms/g' usr/share/webapps/${pkgname}/librenms.nonroot.cron
-   sed -i 's/\/opt\/librenms/\/usr\/share\/webapps\/librenms/g' usr/share/webapps/${pkgname}/librenms.cron
+    # move logs to /var/log
+    rm -rf logs
+    ln -sf /var/log/${pkgname} logs
+}
+
+package() {
+    install -dm0755 "$pkgdir"/usr/share/webapps
+    install -dm0750 "$pkgdir"/etc/webapps/${pkgname}
+    install -dm0755 "$pkgdir"/etc/logrotate.d
+    install -dm0775 "$pkgdir"/var/log/${pkgname}
 
-   # copy config in etc and link it
-   cp usr/share/webapps/${pkgname}/config.php.default etc/webapps/${pkgname}/config.php
-   mv usr/share/webapps/${pkgname}/config.php.default etc/webapps/${pkgname}/config.php.default
-   ln -s ../../../../etc/webapps/${pkgname}/config.php usr/share/webapps/${pkgname}/config.php
-   ln -s ../../../../etc/webapps/${pkgname}/config.php.default usr/share/webapps/${pkgname}/config.php.default
-   rm etc/webapps/${pkgname}/config.php
+    cd "$srcdir"/${pkgname}-${pkgver}
+    cp config.php.default "$pkgdir"/etc/webapps/${pkgname}/config.php
+    cp config.php.default "$pkgdir"/etc/webapps/${pkgname}/config.php.default
+    rm config.php.default
+    ln -s /etc/webapps/${pkgname}/config.php "$pkgdir"/usr/share/webapps/${pkgname}/config.php
+    ln -s /etc/webapps/${pkgname}/config.php.default "$pkgdir"/usr/share/webapps/${pkgname}/config.php.default
 
-   # move logs to /var/log
-   rm -rf usr/share/webapps/${pkgname}/logs
-   ln -sf /var/log/${pkgname} usr/share/webapps/${pkgname}/logs
-   install -D -m644 "${srcdir}"/${pkgname}.logrotate etc/logrotate.d/${pkgname}
+    cp -a "$srcdir"/${pkgname}-${pkgver} "$pkgdir"/usr/share/webapps/${pkgname}
 
-   install -dm0775 usr/share/webapps/${pkgname}/rrd
+    install -D -m644 "${srcdir}"/${pkgname}.logrotate "$pkgdir"/etc/logrotate.d/${pkgname}
+    install -dm0775 "$pkgdir"/usr/share/webapps/${pkgname}/rrd
 
-   # php.ini
-   install -dm0755 $pkgdir/etc/php/conf.d/
+    # php.ini
+    install -dm0755 "$pkgdir"/etc/php/conf.d/
+    echo 'open_basedir = ${open_basedir}:/usr/share/webapps/librenms:/etc/webapps/librenms:/proc' > "$pkgdir"/etc/php/conf.d/${pkgname}.ini
 
-   echo 'open_basedir = ${open_basedir}:/usr/share/webapps/librenms:/etc/webapps/librenms:/proc' > etc/php/conf.d/${pkgname}.ini
+	install -D -m644 "$srcdir"/${pkgname}.sysusers "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf"
+	install -D -m644 "$srcdir"/${pkgname}.tmpfile "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf"
 }
diff --git a/librenms.install b/librenms.install
index 328a73dc26d8..3cab675c43ff 100644
--- a/librenms.install
+++ b/librenms.install
@@ -1,12 +1,6 @@
 # Maintainer: Nils Czernia <nils[at]czserver[dot]de>
 
 post_install() {
-    echo "Adding new User"
-    useradd librenms -d /usr/share/webapps/librenms -M -r
-    usermod -a -G librenms http
-    echo "Changing file permissions"
-    chown -R librenms:librenms /etc/webapps/librenms/
-    chown http:http /var/log/librenms/
     echo "Install new pear modules"
     pear install Net_IPv4
     pear install Net_IPv6
diff --git a/librenms.sysusers b/librenms.sysusers
new file mode 100644
index 000000000000..9bb19dd98b39
--- /dev/null
+++ b/librenms.sysusers
@@ -0,0 +1,4 @@
+# Type  Name      ID        GECOS                   Home directory
+######################################################################
+u       librenms  -         "LibreNMS user"         /usr/share/webapps/librenms
+m       http      librenms
diff --git a/librenms.tmpfile b/librenms.tmpfile
new file mode 100644
index 000000000000..067fd0ba7c71
--- /dev/null
+++ b/librenms.tmpfile
@@ -0,0 +1,3 @@
+d /etc/webapps/librenms/ 0750 librenms http
+d /usr/share/webapps/librenms/ 0755 librenms http
+d /var/log/librenms/ 0775 librenms http