[arch-commits] Commit in cacti/trunk (PKGBUILD cacti.uwsgi)

[David Runge]

    Date: Saturday, February 27, 2021 @ 14:26:01
  Author: dvzrv
Revision: 875112

upgpkg: cacti 1.2.16-3: Rebuild to adjust uwsgi related dependency.

Replace uwsgi with uwsgi-plugin-php in optdepends.
Change uwsgi config to make use of the %n specifier to replace the name.

Modified:
  cacti/trunk/PKGBUILD
  cacti/trunk/cacti.uwsgi

-------------+
 PKGBUILD    |    8 ++++----
 cacti.uwsgi |   14 ++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-27 14:25:27 UTC (rev 875111)
+++ PKGBUILD	2021-02-27 14:26:01 UTC (rev 875112)
@@ -4,7 +4,7 @@
 
 pkgname=cacti
 pkgver=1.2.16
-pkgrel=2
+pkgrel=3
 pkgdesc="Network graphing solution using RRDTool"
 arch=('any')
 url="https://www.cacti.net"
@@ -13,7 +13,7 @@
 optdepends=('mariadb: use local MySQL server'
             'perl: for scripts'
             'php-fpm: run in fastCGI process manager'
-            'uwsgi: run as local application container')
+            'uwsgi-plugin-php: run as local application container')
 backup=('etc/webapps/cacti/.htaccess'
         'etc/webapps/cacti/config.php')
 source=("https://www.${pkgname}.net/downloads/${pkgname}-${pkgver}.tar.gz"
@@ -24,12 +24,12 @@
 install="${pkgname}.install"
 sha512sums=('fe22acf4dea8ab6ec79825d66a84ad4c43fdce2815e7327536d182bc04400ed7b1d268209bbbca8b307c4779ee5bf7369a617ec1f052d8805757c2ca9b30cc35'
             '8c193f52e5478e12f93152356bce085ed7468b1e19657ae92150bb1eee662020fc4f89d5b7aa507465b82b5224834fd78eaa4389e6007136e1fc7df6e7f115a6'
-            'a87241b12226fcad9e161d0f4cd344161015b5fa8e2f1f3af4431d22bd87aad8a4f9553226baed98d48376819e75266a50fd796b1c884b4e597ccf38a5e4de01'
+            'ba421785a3a86535dba210b5ac34ad059fac72b809a9027308d047a967de43aa204eda56e129b28f6400859427de123734b338c5d8cd3da1944893fa3ef33e48'
             '847e2b791de44d0790a2fdb81c77c8af9a66da9d44500f3f8a8d1c0f406d3a20082cc8fef1c6afe4de93ad989d35c79c9809abe14693a9ac6ea74d4696e3b6c1'
             'e833e411f74e77773c32589ba83cb1b2f28ca9b35931626480ab7daa63420d47ecfc3061e6703323646b69e1d98536b6f3afdd36faa483fb13aac9b818af0c6e')
 b2sums=('19939d0ff79c895b481aeb7ffec8331d8b9c10a6b7e0dbda6532e06ef0322f21cf02f4bf53a9522e1f672dd04b343f5550e2f34f08b3af2050e1f72465cffc43'
         'a64a7ef5de93c2906c9fa5c713bf87e451eeaed297efd67b514fa47fdf11262a39d96f8e1be8bfd7c04fa74d31f830f826bcfd3a71a8230ec7454e360f7540bd'
-        'd110c7659ad181e0823dd7a5f02cd43ecffdbc52e18e08fe40e31430631bf700237b343784873ca4b5d5b94ce11fae7a2f8db3ebd09dbb3f784367bdda14be32'
+        '880cfc1a87abd95a624ffef6f1ae5ac416b4020ae40edc32355314bb33b5003b21ab8ed082b520d70b166739a1b056339cca7b6a6bb82167c14925ae3ca0d34f'
         '2ec9956b690ab9244e31a58d295ab56b5d0df9fc9586c74edbd55c12d3383430b8a1a8a708d7d747abadb67eee42094562da510ddfc7797978c2683e7b86a252'
         '0a532bbbd07b21da18ea21eec3f268510740069fb732e3d387f224b93f0539e3e968ba6332bf647ff62f2d98910abc33e35a3e82d335cf7d29a503609e22651f')
 

Modified: cacti.uwsgi
===================================================================
--- cacti.uwsgi	2021-02-27 14:25:27 UTC (rev 875111)
+++ cacti.uwsgi	2021-02-27 14:26:01 UTC (rev 875112)
@@ -2,18 +2,16 @@
 procname-master = %n
 plugins = php
 master = true
-socket = /run/cacti/%n.sock
-stats = /run/cacti/%n-stats.sock
-uid = cacti
-gid = cacti
+socket = /run/%n/%n.sock
+stats = /run/%n/%n-stats.sock
+uid = %n
+gid = %n
 processes = 10
 cheaper = 2
 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
 php-index = index.php
@@ -34,5 +32,5 @@
 php-set = extension=ldap.so
 php-set = extension=snmp
 php-set = extension=sockets.so
-
-cron = -5 -1 -1 -1 -1 /usr/bin/php -d date.timezone=Europe/Berlin -d memory_limit=512M -d max_execution_time=60 -d extension=gd -d extension=gettext -d extension=gmp -d extension=pdo_mysql -d extension=ldap -d extension=snmp -d extension=sockets /usr/share/webapps/cacti/poller.php
+# enable cron after configuring it
+# cron = -5 -1 -1 -1 -1 /usr/bin/php -d date.timezone=Europe/Berlin -d memory_limit=512M -d max_execution_time=60 -d extension=gd -d extension=gettext -d extension=gmp -d extension=pdo_mysql -d extension=ldap -d extension=snmp -d extension=sockets /usr/share/webapps/cacti/poller.php