[arch-commits] Commit in cacti/repos/community-any (10 files)
David Runge
dvzrv at archlinux.org
Fri Nov 6 22:09:45 UTC 2020
Date: Friday, November 6, 2020 @ 22:09:45
Author: dvzrv
Revision: 744645
archrelease: copy trunk to community-any
Added:
cacti/repos/community-any/PKGBUILD
(from rev 744644, cacti/trunk/PKGBUILD)
cacti/repos/community-any/cacti.install
(from rev 744644, cacti/trunk/cacti.install)
cacti/repos/community-any/cacti.sysusers
(from rev 744644, cacti/trunk/cacti.sysusers)
cacti/repos/community-any/cacti.tmpfiles
(from rev 744644, cacti/trunk/cacti.tmpfiles)
cacti/repos/community-any/cacti.uwsgi
(from rev 744644, cacti/trunk/cacti.uwsgi)
Deleted:
cacti/repos/community-any/PKGBUILD
cacti/repos/community-any/cacti.install
cacti/repos/community-any/cacti.sysusers
cacti/repos/community-any/cacti.tmpfiles
cacti/repos/community-any/cacti.uwsgi
----------------+
PKGBUILD | 332 +++++++++++++++++++++++++++----------------------------
cacti.install | 18 +-
cacti.sysusers | 2
cacti.tmpfiles | 34 ++---
cacti.uwsgi | 76 ++++++------
5 files changed, 231 insertions(+), 231 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-06 22:09:30 UTC (rev 744644)
+++ PKGBUILD 2020-11-06 22:09:45 UTC (rev 744645)
@@ -1,166 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: tuxbubling <tuxbubling at jabber.fr>
-
-pkgname=cacti
-pkgver=1.2.14
-pkgrel=1
-pkgdesc="Network graphing solution using RRDTool"
-arch=('any')
-url="https://www.cacti.net"
-license=('GPL2')
-depends=('php-gd' 'php-snmp' 'rrdtool' 'ttf-dejavu')
-optdepends=('mariadb: use local MySQL server'
- 'perl: for scripts'
- 'php-fpm: run in fastCGI process manager'
- 'uwsgi: 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"
- "${pkgname}.uwsgi"
- "${pkgname}.sysusers"
- "${pkgname}.tmpfiles")
-install="${pkgname}.install"
-sha512sums=('734d8e059ea47630072269d92ad79e773268c5dd1cd9c565d23c41b2a74c8892bdc5190f7de6bb9ed281a67ade9c8ef6d723a9d4f486a4ba9aca99182d6ad056'
- 'a87241b12226fcad9e161d0f4cd344161015b5fa8e2f1f3af4431d22bd87aad8a4f9553226baed98d48376819e75266a50fd796b1c884b4e597ccf38a5e4de01'
- '847e2b791de44d0790a2fdb81c77c8af9a66da9d44500f3f8a8d1c0f406d3a20082cc8fef1c6afe4de93ad989d35c79c9809abe14693a9ac6ea74d4696e3b6c1'
- 'e833e411f74e77773c32589ba83cb1b2f28ca9b35931626480ab7daa63420d47ecfc3061e6703323646b69e1d98536b6f3afdd36faa483fb13aac9b818af0c6e')
-b2sums=('555c30ebd06ac71df608a1564892ecd176cf46fa079fd3615dc59fd984bc8bedd4512d971dc3c2731848107da728724ef459d84f0308bef8b0b6ab943b8bc3cf'
- 'd110c7659ad181e0823dd7a5f02cd43ecffdbc52e18e08fe40e31430631bf700237b343784873ca4b5d5b94ce11fae7a2f8db3ebd09dbb3f784367bdda14be32'
- '2ec9956b690ab9244e31a58d295ab56b5d0df9fc9586c74edbd55c12d3383430b8a1a8a708d7d747abadb67eee42094562da510ddfc7797978c2683e7b86a252'
- '0a532bbbd07b21da18ea21eec3f268510740069fb732e3d387f224b93f0539e3e968ba6332bf647ff62f2d98910abc33e35a3e82d335cf7d29a503609e22651f')
-
-prepare() {
- # adding default .htaccess
- echo "Require all denied" > "${pkgname}-htaccess"
- cd "${pkgname}-${pkgver}"
- # setting correct install path for spine
- sed -e 's|/usr/local/spine/bin/spine|/usr/bin/spine|g' \
- -i install/functions.php
- # setting correct path for dejavu font
- sed -e 's|/usr/share/fonts/dejavu/|/usr/share/fonts/TTF/|g' -i lib/rrd.php
- # remove unneeded executable bits
- find . -executable -type f -and -not -path "*scripts*" -exec chmod -c 644 {} \;
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
- # webapp
- install -vDm 640 include/config.php -t "${pkgdir}/etc/webapps/${pkgname}"
- rm -v include/config.php
- install -vDm 644 *.{php,sql} -t "${pkgdir}/usr/share/webapps/${pkgname}"
- install -vDm 644 cli/{*.php,.htaccess} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/cli"
- install -vDm 644 docs/*.{css,html,sql} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/docs"
- install -vDm 644 docs/images/*.png \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/docs/images"
- install -vDm 644 formats/*.{format,php} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/formats"
- install -vDm 644 images/*.{gif,ico,png,svg} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/images"
- install -vDm 644 include/{*.{php,js},cacti_version} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include"
- install -vDm 644 include/content/{*.{html,php},README} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/content"
- install -vDm 644 include/fa/index.php \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa"
- install -vDm 644 include/fa/css/*.{css,php} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa/css"
- install -vDm 644 include/fa/less/*.{less,php} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa/less"
- install -vDm 644 include/fa/scss/*.{php,scss} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa/scss"
- install -vDm 644 include/fa/webfonts/*.{eot,php,svg,ttf,woff,woff2} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa/webfonts"
- install -vDm 644 include/fonts/*.ttf \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fonts"
- install -vDm 644 include/js/*.{js,php} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/js"
- install -vDm 644 include/js/LC_MESSAGES/*.{js,php} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/js/LC_MESSAGES"
- install -vDm 644 include/themes/index.php \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes"
- for theme in {classic,dark,modern,paper-plane,paw,sunrise}; do
- install -vDm 644 include/themes/${theme}/*.{css,js,php} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes/${theme}"
- install -vDm 644 include/themes/${theme}/default/*.{css,gif,php,png} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes/${theme}/default"
- install -vDm 644 include/themes/${theme}/images/*.{gif,ico,png,svg} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes/${theme}/images"
- install -vDm 644 include/themes/${theme}/images/128/*.png \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes/${theme}/images/128"
- done
- cp -av include/vendor "${pkgdir}/usr/share/webapps/${pkgname}/include/"
- install -vDm 644 install/*.{css,csv,js,php} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/install"
- install -vDm 644 install/templates/*.gz \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/install/templates"
- install -vDm 644 install/upgrades/*.php \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/install/upgrades"
- install -vDm 644 lib/*.php \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/lib"
- install -vDm 644 locales/index.php \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/locales"
- install -vDm 644 locales/LC_MESSAGES/*.{mo,php} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/locales/LC_MESSAGES"
- install -vDm 644 locales/po/*.{php,po,pot} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/locales/po"
- install -vDm 644 mibs/{index.php,*-MIB} \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/mibs"
- install -vDm 644 plugins/index.php \
- -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins"
- # config
- install -vDm 644 "${srcdir}/${pkgname}-htaccess" \
- "${pkgdir}/etc/webapps/${pkgname}/.htaccess"
- ln -sv "/etc/webapps/${pkgname}/.htaccess" \
- "${pkgdir}/usr/share/webapps/${pkgname}/.htaccess"
- ln -sv "/etc/webapps/${pkgname}/config.php" \
- "${pkgdir}/usr/share/webapps/${pkgname}/include/config.php"
- # state
- install -vdm 750 "${pkgdir}/var/lib/${pkgname}"
- install -vDm 644 rra/.htaccess -t "${pkgdir}/var/lib/${pkgname}/rra"
- ln -sv "/var/lib/${pkgname}/rra" \
- "${pkgdir}/usr/share/webapps/${pkgname}/rra"
- install -vDm 644 resource/index.php \
- -t "${pkgdir}/var/lib/${pkgname}/resource"
- install -vDm 644 resource/snmp_queries/*.{php,xml} \
- -t "${pkgdir}/var/lib/${pkgname}/resource/snmp_queries/"
- install -vDm 644 resource/script_server/*.{php,xml} \
- -t "${pkgdir}/var/lib/${pkgname}/resource/script_server/"
- install -vDm 644 resource/script_queries/*.{php,xml} \
- -t "${pkgdir}/var/lib/${pkgname}/resource/script_queries/"
- ln -sv "/var/lib/${pkgname}/resource" \
- "${pkgdir}/usr/share/webapps/${pkgname}/resource"
- install -vDm 644 scripts/*.{php,pl,sh} \
- -t "${pkgdir}/var/lib/${pkgname}/scripts"
- ln -sv "/var/lib/${pkgname}/scripts" \
- "${pkgdir}/usr/share/webapps/${pkgname}/scripts"
- # cache
- install -vdm 750 "${pkgdir}/var/cache/${pkgname}"
- install -vDm 644 cache/boost/index.php \
- -t "${pkgdir}/var/cache/${pkgname}/boost"
- install -vDm 644 cache/mibcache/index.php \
- -t "${pkgdir}/var/cache/${pkgname}/mibcache"
- install -vDm 644 cache/realtime/index.php \
- -t "${pkgdir}/var/cache/${pkgname}/realtime"
- install -vDm 644 cache/spikekill/index.php \
- -t "${pkgdir}/var/cache/${pkgname}/spikekill"
- ln -sv "/var/cache/${pkgname}" \
- "${pkgdir}/usr/share/webapps/${pkgname}/cache"
- # log
- install -vdm 750 "${pkgdir}/var/log/${pkgname}"
- install -vDm 644 log/.htaccess -t "${pkgdir}/var/log/${pkgname}"
- ln -sv "/var/log/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/log"
- # docs
- install -vDm 644 {CHANGELOG,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
- # tmpfiles.d
- install -vDm 644 "${srcdir}/${pkgname}.tmpfiles" \
- "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
- # sysusers.d
- install -vDm 644 "${srcdir}/${pkgname}.sysusers" \
- "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
- # uwsgi config
- install -vDm 644 "${srcdir}/${pkgname}.uwsgi" \
- "${pkgdir}/etc/uwsgi/${pkgname}.ini"
-}
Copied: cacti/repos/community-any/PKGBUILD (from rev 744644, cacti/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-06 22:09:45 UTC (rev 744645)
@@ -0,0 +1,166 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: tuxbubling <tuxbubling at jabber.fr>
+
+pkgname=cacti
+pkgver=1.2.15
+pkgrel=1
+pkgdesc="Network graphing solution using RRDTool"
+arch=('any')
+url="https://www.cacti.net"
+license=('GPL2')
+depends=('php-gd' 'php-snmp' 'rrdtool' 'ttf-dejavu')
+optdepends=('mariadb: use local MySQL server'
+ 'perl: for scripts'
+ 'php-fpm: run in fastCGI process manager'
+ 'uwsgi: 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"
+ "${pkgname}.uwsgi"
+ "${pkgname}.sysusers"
+ "${pkgname}.tmpfiles")
+install="${pkgname}.install"
+sha512sums=('c776d7beef9f6172485e38b21afa6a3ae05be0993d056eabb9051bb3f48c0074dba8c15ec5e9eea41560bb35ba199b42d3e5c48375fdb0362618f0d68de4c1f5'
+ 'a87241b12226fcad9e161d0f4cd344161015b5fa8e2f1f3af4431d22bd87aad8a4f9553226baed98d48376819e75266a50fd796b1c884b4e597ccf38a5e4de01'
+ '847e2b791de44d0790a2fdb81c77c8af9a66da9d44500f3f8a8d1c0f406d3a20082cc8fef1c6afe4de93ad989d35c79c9809abe14693a9ac6ea74d4696e3b6c1'
+ 'e833e411f74e77773c32589ba83cb1b2f28ca9b35931626480ab7daa63420d47ecfc3061e6703323646b69e1d98536b6f3afdd36faa483fb13aac9b818af0c6e')
+b2sums=('e413ce9f58a673294ae5d7d3416db6cfebbe39cf93bb84fe1be32d8e16c049e2f22f765a632ae6951652886e24a04cd51d081df6f70601b7c33adf40518f5b55'
+ 'd110c7659ad181e0823dd7a5f02cd43ecffdbc52e18e08fe40e31430631bf700237b343784873ca4b5d5b94ce11fae7a2f8db3ebd09dbb3f784367bdda14be32'
+ '2ec9956b690ab9244e31a58d295ab56b5d0df9fc9586c74edbd55c12d3383430b8a1a8a708d7d747abadb67eee42094562da510ddfc7797978c2683e7b86a252'
+ '0a532bbbd07b21da18ea21eec3f268510740069fb732e3d387f224b93f0539e3e968ba6332bf647ff62f2d98910abc33e35a3e82d335cf7d29a503609e22651f')
+
+prepare() {
+ # adding default .htaccess
+ echo "Require all denied" > "${pkgname}-htaccess"
+ cd "${pkgname}-${pkgver}"
+ # setting correct install path for spine
+ sed -e 's|/usr/local/spine/bin/spine|/usr/bin/spine|g' \
+ -i install/functions.php
+ # setting correct path for dejavu font
+ sed -e 's|/usr/share/fonts/dejavu/|/usr/share/fonts/TTF/|g' -i lib/rrd.php
+ # remove unneeded executable bits
+ find . -executable -type f -and -not -path "*scripts*" -exec chmod -c 644 {} \;
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ # webapp
+ install -vDm 640 include/config.php -t "${pkgdir}/etc/webapps/${pkgname}"
+ rm -v include/config.php
+ install -vDm 644 *.{php,sql} -t "${pkgdir}/usr/share/webapps/${pkgname}"
+ install -vDm 644 cli/{*.php,.htaccess} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/cli"
+ install -vDm 644 docs/*.{css,html,sql} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/docs"
+ install -vDm 644 docs/images/*.png \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/docs/images"
+ install -vDm 644 formats/*.{format,php} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/formats"
+ install -vDm 644 images/*.{gif,ico,png,svg} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/images"
+ install -vDm 644 include/{*.{php,js},cacti_version} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include"
+ install -vDm 644 include/content/{*.{html,php},README} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/content"
+ install -vDm 644 include/fa/index.php \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa"
+ install -vDm 644 include/fa/css/*.{css,php} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa/css"
+ install -vDm 644 include/fa/less/*.{less,php} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa/less"
+ install -vDm 644 include/fa/scss/*.{php,scss} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa/scss"
+ install -vDm 644 include/fa/webfonts/*.{eot,php,svg,ttf,woff,woff2} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fa/webfonts"
+ install -vDm 644 include/fonts/*.ttf \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/fonts"
+ install -vDm 644 include/js/*.{js,php} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/js"
+ install -vDm 644 include/js/LC_MESSAGES/*.{js,php} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/js/LC_MESSAGES"
+ install -vDm 644 include/themes/index.php \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes"
+ for theme in {classic,dark,modern,paper-plane,paw,sunrise}; do
+ install -vDm 644 include/themes/${theme}/*.{css,js,php} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes/${theme}"
+ install -vDm 644 include/themes/${theme}/default/*.{css,gif,php,png} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes/${theme}/default"
+ install -vDm 644 include/themes/${theme}/images/*.{gif,ico,png,svg} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes/${theme}/images"
+ install -vDm 644 include/themes/${theme}/images/128/*.png \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/include/themes/${theme}/images/128"
+ done
+ cp -av include/vendor "${pkgdir}/usr/share/webapps/${pkgname}/include/"
+ install -vDm 644 install/*.{css,csv,js,php} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/install"
+ install -vDm 644 install/templates/*.gz \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/install/templates"
+ install -vDm 644 install/upgrades/*.php \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/install/upgrades"
+ install -vDm 644 lib/*.php \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/lib"
+ install -vDm 644 locales/index.php \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/locales"
+ install -vDm 644 locales/LC_MESSAGES/*.{mo,php} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/locales/LC_MESSAGES"
+ install -vDm 644 locales/po/*.{php,po,pot} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/locales/po"
+ install -vDm 644 mibs/{index.php,*-MIB} \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/mibs"
+ install -vDm 644 plugins/index.php \
+ -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins"
+ # config
+ install -vDm 644 "${srcdir}/${pkgname}-htaccess" \
+ "${pkgdir}/etc/webapps/${pkgname}/.htaccess"
+ ln -sv "/etc/webapps/${pkgname}/.htaccess" \
+ "${pkgdir}/usr/share/webapps/${pkgname}/.htaccess"
+ ln -sv "/etc/webapps/${pkgname}/config.php" \
+ "${pkgdir}/usr/share/webapps/${pkgname}/include/config.php"
+ # state
+ install -vdm 750 "${pkgdir}/var/lib/${pkgname}"
+ install -vDm 644 rra/.htaccess -t "${pkgdir}/var/lib/${pkgname}/rra"
+ ln -sv "/var/lib/${pkgname}/rra" \
+ "${pkgdir}/usr/share/webapps/${pkgname}/rra"
+ install -vDm 644 resource/index.php \
+ -t "${pkgdir}/var/lib/${pkgname}/resource"
+ install -vDm 644 resource/snmp_queries/*.{php,xml} \
+ -t "${pkgdir}/var/lib/${pkgname}/resource/snmp_queries/"
+ install -vDm 644 resource/script_server/*.{php,xml} \
+ -t "${pkgdir}/var/lib/${pkgname}/resource/script_server/"
+ install -vDm 644 resource/script_queries/*.{php,xml} \
+ -t "${pkgdir}/var/lib/${pkgname}/resource/script_queries/"
+ ln -sv "/var/lib/${pkgname}/resource" \
+ "${pkgdir}/usr/share/webapps/${pkgname}/resource"
+ install -vDm 644 scripts/*.{php,pl,sh} \
+ -t "${pkgdir}/var/lib/${pkgname}/scripts"
+ ln -sv "/var/lib/${pkgname}/scripts" \
+ "${pkgdir}/usr/share/webapps/${pkgname}/scripts"
+ # cache
+ install -vdm 750 "${pkgdir}/var/cache/${pkgname}"
+ install -vDm 644 cache/boost/index.php \
+ -t "${pkgdir}/var/cache/${pkgname}/boost"
+ install -vDm 644 cache/mibcache/index.php \
+ -t "${pkgdir}/var/cache/${pkgname}/mibcache"
+ install -vDm 644 cache/realtime/index.php \
+ -t "${pkgdir}/var/cache/${pkgname}/realtime"
+ install -vDm 644 cache/spikekill/index.php \
+ -t "${pkgdir}/var/cache/${pkgname}/spikekill"
+ ln -sv "/var/cache/${pkgname}" \
+ "${pkgdir}/usr/share/webapps/${pkgname}/cache"
+ # log
+ install -vdm 750 "${pkgdir}/var/log/${pkgname}"
+ install -vDm 644 log/.htaccess -t "${pkgdir}/var/log/${pkgname}"
+ ln -sv "/var/log/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/log"
+ # docs
+ install -vDm 644 {CHANGELOG,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
+ # tmpfiles.d
+ install -vDm 644 "${srcdir}/${pkgname}.tmpfiles" \
+ "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+ # sysusers.d
+ install -vDm 644 "${srcdir}/${pkgname}.sysusers" \
+ "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+ # uwsgi config
+ install -vDm 644 "${srcdir}/${pkgname}.uwsgi" \
+ "${pkgdir}/etc/uwsgi/${pkgname}.ini"
+}
Deleted: cacti.install
===================================================================
--- cacti.install 2020-11-06 22:09:30 UTC (rev 744644)
+++ cacti.install 2020-11-06 22:09:45 UTC (rev 744645)
@@ -1,9 +0,0 @@
-post_upgrade() {
- local new_package_version="$1"
- local old_package_version="$2"
- if [ $(vercmp "${old_package_version}" "1.2.2") -le 0 ]; then
-cat <<EOF
-The webapp now needs to be run as its own user/group: cacti/cacti.
-EOF
- fi
-}
Copied: cacti/repos/community-any/cacti.install (from rev 744644, cacti/trunk/cacti.install)
===================================================================
--- cacti.install (rev 0)
+++ cacti.install 2020-11-06 22:09:45 UTC (rev 744645)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ local new_package_version="$1"
+ local old_package_version="$2"
+ if [ $(vercmp "${old_package_version}" "1.2.2") -le 0 ]; then
+cat <<EOF
+The webapp now needs to be run as its own user/group: cacti/cacti.
+EOF
+ fi
+}
Deleted: cacti.sysusers
===================================================================
--- cacti.sysusers 2020-11-06 22:09:30 UTC (rev 744644)
+++ cacti.sysusers 2020-11-06 22:09:45 UTC (rev 744645)
@@ -1 +0,0 @@
-u cacti - "Cacti user" -
Copied: cacti/repos/community-any/cacti.sysusers (from rev 744644, cacti/trunk/cacti.sysusers)
===================================================================
--- cacti.sysusers (rev 0)
+++ cacti.sysusers 2020-11-06 22:09:45 UTC (rev 744645)
@@ -0,0 +1 @@
+u cacti - "Cacti user" -
Deleted: cacti.tmpfiles
===================================================================
--- cacti.tmpfiles 2020-11-06 22:09:30 UTC (rev 744644)
+++ cacti.tmpfiles 2020-11-06 22:09:45 UTC (rev 744645)
@@ -1,17 +0,0 @@
-z /etc/webapps/cacti/*.php 0640 cacti cacti
-d %L/cacti 0750 cacti cacti
-z %L/cacti/*.log - cacti cacti
-d %S/cacti 0750 cacti cacti
-d %S/cacti/rra - cacti cacti
-z %S/cacti/rra/*.rrd - cacti cacti
-d %S/cacti/resource 755 cacti cacti
-d %S/cacti/resource/snmp_queries 755 cacti cacti
-d %S/cacti/resource/script_server 755 cacti cacti
-d %S/cacti/resource/script_queries 755 cacti cacti
-d %S/cacti/scripts 755 cacti cacti
-d %t/cacti 755 cacti cacti
-d %C/cacti 750 cacti cacti
-d %C/cacti/boost 755 cacti cacti
-d %C/cacti/mibcache 755 cacti cacti
-d %C/cacti/realtime 755 cacti cacti
-d %C/cacti/spikekill 755 cacti cacti
Copied: cacti/repos/community-any/cacti.tmpfiles (from rev 744644, cacti/trunk/cacti.tmpfiles)
===================================================================
--- cacti.tmpfiles (rev 0)
+++ cacti.tmpfiles 2020-11-06 22:09:45 UTC (rev 744645)
@@ -0,0 +1,17 @@
+z /etc/webapps/cacti/*.php 0640 cacti cacti
+d %L/cacti 0750 cacti cacti
+z %L/cacti/*.log - cacti cacti
+d %S/cacti 0750 cacti cacti
+d %S/cacti/rra - cacti cacti
+z %S/cacti/rra/*.rrd - cacti cacti
+d %S/cacti/resource 755 cacti cacti
+d %S/cacti/resource/snmp_queries 755 cacti cacti
+d %S/cacti/resource/script_server 755 cacti cacti
+d %S/cacti/resource/script_queries 755 cacti cacti
+d %S/cacti/scripts 755 cacti cacti
+d %t/cacti 755 cacti cacti
+d %C/cacti 750 cacti cacti
+d %C/cacti/boost 755 cacti cacti
+d %C/cacti/mibcache 755 cacti cacti
+d %C/cacti/realtime 755 cacti cacti
+d %C/cacti/spikekill 755 cacti cacti
Deleted: cacti.uwsgi
===================================================================
--- cacti.uwsgi 2020-11-06 22:09:30 UTC (rev 744644)
+++ cacti.uwsgi 2020-11-06 22:09:45 UTC (rev 744645)
@@ -1,38 +0,0 @@
-[uwsgi]
-procname-master = %n
-plugins = php
-master = true
-socket = /run/cacti/%n.sock
-stats = /run/cacti/%n-stats.sock
-uid = cacti
-gid = cacti
-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
-php-set = date.timezone=Europe/Berlin
-php-set = open_basedir=/tmp/:/usr/share/webapps/%n:/etc/webapps/%n:/var/cache/%n:/var/lib/%n:/var/log/%n:/proc/meminfo:/usr/bin/rrdtool:/usr/bin/snmpget:/usr/bin/snmpwalk:/usr/bin/snmpbulkwalk:/usr/bin/snmpgetnext:/usr/bin/snmptrap:/usr/bin/sendmail:/usr/bin/php:/usr/bin/spine:/usr/share/fonts/TTF/
-php-set = memory_limit = 512M
-php-set = max_execution_time = 60
-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=64M
-php-set = upload_max_filesize=64M
-php-set = extension=gd.so
-php-set = extension=gettext.so
-php-set = extension=gmp.so
-php-set = extension=pdo_mysql.so
-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
Copied: cacti/repos/community-any/cacti.uwsgi (from rev 744644, cacti/trunk/cacti.uwsgi)
===================================================================
--- cacti.uwsgi (rev 0)
+++ cacti.uwsgi 2020-11-06 22:09:45 UTC (rev 744645)
@@ -0,0 +1,38 @@
+[uwsgi]
+procname-master = %n
+plugins = php
+master = true
+socket = /run/cacti/%n.sock
+stats = /run/cacti/%n-stats.sock
+uid = cacti
+gid = cacti
+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
+php-set = date.timezone=Europe/Berlin
+php-set = open_basedir=/tmp/:/usr/share/webapps/%n:/etc/webapps/%n:/var/cache/%n:/var/lib/%n:/var/log/%n:/proc/meminfo:/usr/bin/rrdtool:/usr/bin/snmpget:/usr/bin/snmpwalk:/usr/bin/snmpbulkwalk:/usr/bin/snmpgetnext:/usr/bin/snmptrap:/usr/bin/sendmail:/usr/bin/php:/usr/bin/spine:/usr/share/fonts/TTF/
+php-set = memory_limit = 512M
+php-set = max_execution_time = 60
+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=64M
+php-set = upload_max_filesize=64M
+php-set = extension=gd.so
+php-set = extension=gettext.so
+php-set = extension=gmp.so
+php-set = extension=pdo_mysql.so
+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
More information about the arch-commits
mailing list