PKGBUILD: Upgrading to 1.52. Adding uwsgi configuration.

librenms.tmpfiles: Adding /run/librenms.

4 files changed, 59 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d2534fb5f26..6010496c33ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = librenms
 	pkgdesc = Autodiscovering PHP/MySQL/SNMP based network monitoring
-	pkgver = 1.48.1
+	pkgver = 1.52
 	pkgrel = 1
 	url = https://www.librenms.org/
 	arch = any
@@ -29,10 +29,12 @@ pkgbase = librenms
 	backup = etc/cron.d/librenms
 	source = librenms.sysusers
 	source = librenms.tmpfiles
+	source = librenms.uwsgi
 	source = apache.example.conf
 	source = nginx.example.conf
 	sha512sums = 19fa542b7597adeccdb94add97102a86ba4a238ba44e999c6e8d186cb7d5ed0523893559719e0b8036acd90cdc1a908497c3027ed49b028fba729ed61ad34052
-	sha512sums = e462785a695a19ee4104b48ef321e5d597f6e7469c15f362062d8a4eebe2eddca5584e4739046655a448caa7c4402625d88479fae562be859ed3a6e7d4766b23
+	sha512sums = ce020d1a85b9c897dacceb45840aae30e305b65d96854e19a4a58e3ddbc1c78694de1a8665a51c2fb53929f8f52c94bc0d918ab3fd06ede4935e8a617e755f24
+	sha512sums = f575ed35f6fa1ae9ffd2b7c00e292de574e4a62e60fba7b653e9f55f4d987959be08331c08afa7afe8a616eb9f3a35f304912416f07ea170b70887bf8ff94c2f
 	sha512sums = 150aa9912d25502d9397f0c4a6831363c79c1603ff65151d4efc0061516ee19586f3cc38f08f9e60530176c103c845d0cc1a46f685cb22c1a8a7cb8db4ab6274
 	sha512sums = cde868416a13353290e4063c937e13b029e616abe3416e4e7c906bbd8000f871429546335470bbc2b219c1bcc95d6ee0f79481ee765c7351bbed6487ad42fee4
 
diff --git a/PKGBUILD b/PKGBUILD
index c06d11bfe0d4..d5928db6b278 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: David Runge <dave@sleepmap.de>
 # Contributor: Nils Czernia <nils[at]czserver[dot]de>
 pkgname=librenms
-pkgver=1.48.1
+pkgver=1.52
 pkgrel=1
 pkgdesc='Autodiscovering PHP/MySQL/SNMP based network monitoring'
 arch=('any')
@@ -18,13 +18,14 @@ backup=("etc/webapps/${pkgname}/config.php"
         "etc/webapps/${pkgname}/.env"
         "etc/php/conf.d/${pkgname}.ini"
         "etc/cron.d/${pkgname}")
-# TODO: add uwsgi example
 source=("${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
+        "${pkgname}.uwsgi"
         "apache.example.conf"
         "nginx.example.conf")
 sha512sums=('19fa542b7597adeccdb94add97102a86ba4a238ba44e999c6e8d186cb7d5ed0523893559719e0b8036acd90cdc1a908497c3027ed49b028fba729ed61ad34052'
-            'e462785a695a19ee4104b48ef321e5d597f6e7469c15f362062d8a4eebe2eddca5584e4739046655a448caa7c4402625d88479fae562be859ed3a6e7d4766b23'
+            'ce020d1a85b9c897dacceb45840aae30e305b65d96854e19a4a58e3ddbc1c78694de1a8665a51c2fb53929f8f52c94bc0d918ab3fd06ede4935e8a617e755f24'
+            'f575ed35f6fa1ae9ffd2b7c00e292de574e4a62e60fba7b653e9f55f4d987959be08331c08afa7afe8a616eb9f3a35f304912416f07ea170b70887bf8ff94c2f'
             '150aa9912d25502d9397f0c4a6831363c79c1603ff65151d4efc0061516ee19586f3cc38f08f9e60530176c103c845d0cc1a46f685cb22c1a8a7cb8db4ab6274'
             'cde868416a13353290e4063c937e13b029e616abe3416e4e7c906bbd8000f871429546335470bbc2b219c1bcc95d6ee0f79481ee765c7351bbed6487ad42fee4')
 
@@ -115,6 +116,9 @@ package() {
   # tmpfiles.d
   install -vDm 644 ../${pkgname}.tmpfiles \
     "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  # uwsgi
+  install -vDm 644 ../${pkgname}.uwsgi \
+    "${pkgdir}/etc/uwsgi/${pkgname}.ini"
   # logs
   ln -sv "/var/log/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/logs"
   # cache
diff --git a/librenms.tmpfiles b/librenms.tmpfiles
index 76e1c38a00d0..ed3c775926fc 100644
--- a/librenms.tmpfiles
+++ b/librenms.tmpfiles
@@ -28,3 +28,4 @@ d %S/librenms/storage/framework/views/ 0755 librenms librenms
 z %S/librenms/storage/framework/views/* 0640 librenms librenms
 d %S/librenms/storage/logs/ 0755 librenms librenms
 z %S/librenms/storage/logs/* 0640 librenms librenms
+d %t/librenms - librenms librenms
diff --git a/librenms.uwsgi b/librenms.uwsgi
new file mode 100644
index 000000000000..2b50c4138bc2
--- /dev/null
+++ b/librenms.uwsgi
@@ -0,0 +1,47 @@
+[uwsgi]
+procname-master = %n
+plugins = php
+master = true
+socket = /run/%n/%n.sock
+stats = /run/%n/%n-stats.sock
+uid = librenms
+gid = librenms
+processes = 10
+cheaper = 4
+cheaper-step = 1
+idle = 600
+die-on-idle = true
+
+; reload whenever this config file changes
+touch-reload = %p
+
+php-allowed-ext = .php
+php-docroot = /usr/share/webapps/%n/html
+php-index = index.php
+php-set = date.timezone=Europe/Berlin
+php-set = open_basedir=:/dev/urandom:/etc/webapps/%n:/usr/bin/fping:/usr/bin/fping6:/usr/bin/rrdtool:/usr/bin/snmpbulkwalk:/usr/bin/snmpget:/usr/bin/snmpgetnext:/usr/bin/snmpwalk:/usr/share/webapps/%n:/proc/meminfo:/run/redis/redis.sock:/var/lib/%n:/var/log/%n:/tmp/
+php-set = session.save_path=/tmp
+php-set = session.gc_maxlifetime  21600
+php-set = session.gc_divisor  500
+php-set = session.gc_probability  1
+php-set = post_max_size=32M
+php-set = upload_max_filesize=4M
+php-set = always_populate_raw_post_data=-1
+php-set = mbstring.func_overload=0
+php-set = max_input_time=300
+php-set = max_execution_time=300
+php-set = memory_limit=256M
+php-set = session.auto_start=0
+php-set = zend_extension=opcache
+php-set = opcache.enable=1
+php-set = opcache.enable_cli=1
+php-set = opcache.interned_strings_buffer=8
+php-set = opcache.max_accelerated_files=10000
+php-set = opcache.memory_consumption=128
+php-set = opcache.save_comments=1
+php-set = opcache.revalidate_freq=1
+
+php-set = extension=gd
+php-set = extension=mysqli
+php-set = extension=pdo_mysql
+