From c4d302097e74539b53c7979639f51ea793f723d5 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Fri, 9 Sep 2022 21:25:21 -0500 Subject: [PATCH] Call php without number --- root/defaults/root | 2 +- root/etc/cont-init.d/50-install | 2 +- root/etc/cont-init.d/70-aliases | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/root/defaults/root b/root/defaults/root index f973cd3..85227e4 100644 --- a/root/defaults/root +++ b/root/defaults/root @@ -6,4 +6,4 @@ 0 3 * * 6 run-parts /etc/periodic/weekly 0 5 1 * * run-parts /etc/periodic/monthly # nextcloud cron -*/5 * * * * s6-setuidgid abc php8 -f /config/www/nextcloud/cron.php +*/5 * * * * s6-setuidgid abc php -f /config/www/nextcloud/cron.php diff --git a/root/etc/cont-init.d/50-install b/root/etc/cont-init.d/50-install index d38b407..5f09601 100644 --- a/root/etc/cont-init.d/50-install +++ b/root/etc/cont-init.d/50-install @@ -18,5 +18,5 @@ fi if [[ ! -f /config/crontabs/root ]]; then cp /defaults/root /config/crontabs/root fi -sed -i "s|s6-setuidgid abc php7 -f /config/www/nextcloud/cron.php|s6-setuidgid abc php8 -f /config/www/nextcloud/cron.php|" /config/crontabs/root +sed -i "s|s6-setuidgid abc php[78] -f /config/www/nextcloud/cron.php|s6-setuidgid abc php -f /config/www/nextcloud/cron.php|" /config/crontabs/root cp /config/crontabs/root /etc/crontabs/root diff --git a/root/etc/cont-init.d/70-aliases b/root/etc/cont-init.d/70-aliases index 920adfd..354bb4d 100644 --- a/root/etc/cont-init.d/70-aliases +++ b/root/etc/cont-init.d/70-aliases @@ -2,7 +2,7 @@ ## Set alias for occ and make executable if [[ ! -f /usr/bin/occ ]]; then - echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php8 /config/www/nextcloud/occ $*"' > /usr/bin/occ + echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php /config/www/nextcloud/occ $*"' > /usr/bin/occ fi if [[ ! -x /usr/bin/occ ]]; then @@ -11,7 +11,7 @@ fi ## Set alias for updater.phar and make executable if [[ ! -f /usr/bin/updater.phar ]]; then - echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php8 /config/www/nextcloud/updater/updater.phar $*"' > /usr/bin/updater.phar + echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php /config/www/nextcloud/updater/updater.phar $*"' > /usr/bin/updater.phar fi if [[ ! -x /usr/bin/updater.phar ]]; then