diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2023-04-15 19:22:10 +0200 |
|---|---|---|
| committer | alice <alice@ayaya.dev> | 2023-04-15 22:40:24 +0000 |
| commit | ebd2232b153982c923ae06c824bb2074c149543f (patch) | |
| tree | 3f12c33616e4c212a5e268592657c8f87e540bd1 | |
| parent | b6cd7d185bf3dc513d46da0ad6ca9ecba7c9663c (diff) | |
community/cacti: use php82
| -rw-r--r-- | community/cacti/APKBUILD | 19 | ||||
| -rw-r--r-- | community/cacti/cacti.crontab | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/community/cacti/APKBUILD b/community/cacti/APKBUILD index d52f351b081..32bffec47ec 100644 --- a/community/cacti/APKBUILD +++ b/community/cacti/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Jeff Bilyk <jbilyk@gmail.com> pkgname=cacti pkgver=1.2.24 -pkgrel=0 +pkgrel=1 pkgdesc="The complete rrdtool-based graphing solution" url="https://www.cacti.net/" arch="noarch" @@ -12,9 +12,9 @@ options="!check" pkgusers=$pkgname pkggroups="www-data" depends="bash perl coreutils net-snmp-tools rrdtool font-dejavu" -subpackages="$pkgname-doc $pkgname-lang $pkgname-setup $pkgname-php81:_php" +subpackages="$pkgname-doc $pkgname-lang $pkgname-setup $pkgname-php:_php" install="$pkgname.pre-install $pkgname-setup.post-install" -source="https://www.cacti.net/downloads/cacti-$pkgver.tar.gz +source="cacti-src-$pkgver.tar.gz::https://www.cacti.net/downloads/cacti-$pkgver.tar.gz $pkgname.crontab $pkgname.nginx.conf $pkgname.php-fpm.conf @@ -76,7 +76,7 @@ package() { ln -s /var/log/$pkgname "$pkgdir"/usr/share/webapps/$pkgname/log # move config to /etc - mv "$pkgdir"/usr/share/webapps/$pkgname/include/config.php \ + mv "$pkgdir"/usr/share/webapps/$pkgname/include/config.php.dist \ "$pkgdir"/etc/$pkgname/config.php ln -s /etc/$pkgname/config.php \ "$pkgdir"/usr/share/webapps/$pkgname/include/config.php @@ -134,21 +134,24 @@ setup() { } _php() { - local php=${subpkgname#$pkgname-} + local php=php82 pkgdesc="$pkgdesc ($php dependencies)" install_if="$php-config $pkgname=$pkgver-r$pkgrel" depends="$php $php-gd $php-gmp $php-ldap $php-mbstring $php-pdo_mysql $php-opcache $php-openssl $php-posix $php-session $php-simplexml $php-snmp $php-sockets - $php-xml $php-zlib" + $php-xml $php-fpm" + provides="cacti-php81=$pkgver-r$pkgrel" # for backward compatibility + replaces="cacti-php81" # for backward compatibility # cacti's php-fpm pool config install -Dm644 "$srcdir"/$pkgname.php-fpm.conf \ "$subpkgdir"/etc/$php/php-fpm.d/$pkgname.conf + amove etc/crontabs/$pkgname } sha512sums=" -cdc840a39b06fd40fe1fad117af3f28132b5fed295471b8c2138fed41aad8a43b92dbd551b87f88fd7a8823f453d3ce0828558d226ff4206edf50a3f0c96d42f cacti-1.2.24.tar.gz -aad5220cd7490e495411c0b6a2fc43d3eeaf0b2509ecb932a02274b3bf0c41c68c8cd68a31679b23e252232232b07fcf7722f46bd83d78fd620e6b282268792f cacti.crontab +e6c7644e80335a3811bc55a93ba3a39ee973b54e75668e355946e141f37a747a0c211b55f6b25e8fd2dfa1e6194849bd3164249bfa0628a2e2852659aac235c5 cacti-src-1.2.24.tar.gz +2ff197a75e366b4fdb2f651643a08b5b14140225edd5aea673cfbedeb92aab0b4625c789896990cc023e35fb20c2370c917253c92f51568b293f39452f1a6b74 cacti.crontab 9b3fe765c6196c0e4988efaa7236d8a8b945725548371b4a0e2a371de374c9577a908d58dcef5a4e59e089ca923cfeb7c5ddea9ee983a5115239052cf9b8ab59 cacti.nginx.conf 056358fc69752fb5129729db91a22d06c97ca452068017ccfe0ede8f2bf42f62e5072415c7db2eb5b9346d6bc54092bc147044e40b2156d8037dfee4a7e55e5b cacti.php-fpm.conf " diff --git a/community/cacti/cacti.crontab b/community/cacti/cacti.crontab index 9d084b3739d..3d250ffd2d7 100644 --- a/community/cacti/cacti.crontab +++ b/community/cacti/cacti.crontab @@ -1 +1 @@ -*/5 * * * * php8 /usr/share/webapps/cacti/poller.php >/dev/null 2>&1 +*/5 * * * * php82 /usr/share/webapps/cacti/poller.php >/dev/null 2>&1 |