From f2fcbc2f469f87be584bb086918413c120e9b9f4 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Tue, 22 Nov 2022 22:17:10 +0100
Subject: [PATCH] Update php from 8 to 8.1 version for Nextcloud, mailbackup
 and heimdall

---
 CT-Build/Alpine.yaml                       | 94 +++++++++++-----------
 CT-Files/heimdall/Scripts/Init.sh          |  6 +-
 CT-Files/nextcloud/Scripts/FirstRun.sh     | 34 ++++----
 CT-Files/nextcloud/Scripts/Init.sh         | 12 +--
 CT-Files/nextcloud/Scripts/PTKAppUpdate.sh |  2 +-
 5 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml
index ead558e..3d1b283 100644
--- a/CT-Build/Alpine.yaml
+++ b/CT-Build/Alpine.yaml
@@ -456,34 +456,34 @@ packages:
 
   #PKGS for nextcloud
   - packages:
-    - php8-pdo_mysql
-    - php8-pecl-imagick
-    - php8-cli
-    - php8-pecl-apcu
-    - php8-pecl-redis
-    - php8-fpm
-    - php8-cgi
-    - php8-common
-    - php8-mbstring
-    - php8-curl
-    - php8-gd
-    - php8-intl
-    - php8-soap
-    - php8-xml
-    - php8-zip
-    - php8-pear
-    - php8-session
-    - php8-posix
-    - php8-pdo
-    - php8-dom
-    - php8-simplexml
-    - php8-xmlreader
-    - php8-xmlwriter
-    - php8-opcache
-    - php8-pcntl
-    - php8-fileinfo
-    - php8-bcmath
-    - php8-gmp
+    - php81-pdo_mysql
+    - php81-pecl-imagick
+    - php81-cli
+    - php81-pecl-apcu
+    - php81-pecl-redis
+    - php81-fpm
+    - php81-cgi
+    - php81-common
+    - php81-mbstring
+    - php81-curl
+    - php81-gd
+    - php81-intl
+    - php81-soap
+    - php81-xml
+    - php81-zip
+    - php81-pear
+    - php81-session
+    - php81-posix
+    - php81-pdo
+    - php81-dom
+    - php81-simplexml
+    - php81-xmlreader
+    - php81-xmlwriter
+    - php81-opcache
+    - php81-pcntl
+    - php81-fileinfo
+    - php81-bcmath
+    - php81-gmp
     - libpng
     - zlib
     - imagemagick
@@ -528,12 +528,12 @@ packages:
 #PKGS for MailBackup
   - packages:
     - dovecot
-    - php8-xml
-    - php8-fpm
-    - php8-curl
-    - php8-dom
-    - php8-zip
-    - php8-mbstring
+    - php81-xml
+    - php81-fpm
+    - php81-curl
+    - php81-dom
+    - php81-zip
+    - php81-mbstring
     - php-openssl
     - py3-pip
     - sudo
@@ -571,19 +571,19 @@ packages:
 #PKGS for Heimdall
   - packages:
     - git
-    - php8
-    - php8-ctype
-    - php8-curl
-    - php8-pdo_sqlite
-    - php8-mbstring
-    - php8-json
-    - php8-zip
-    - php8-xml
-    - php8-fpm
-    - php8-session
-    - php8-openssl
-    - php8-tokenizer
-    - php8-fileinfo
+    - php81
+    - php81-ctype
+    - php81-curl
+    - php81-pdo_sqlite
+    - php81-mbstring
+    - php81-json
+    - php81-zip
+    - php81-xml
+    - php81-fpm
+    - php81-session
+    - php81-openssl
+    - php81-tokenizer
+    - php81-fileinfo
     action: install
     variants:
     - heimdall 
diff --git a/CT-Files/heimdall/Scripts/Init.sh b/CT-Files/heimdall/Scripts/Init.sh
index 9ab0198..c803365 100644
--- a/CT-Files/heimdall/Scripts/Init.sh
+++ b/CT-Files/heimdall/Scripts/Init.sh
@@ -5,9 +5,9 @@ rm -rf /etc/nginx/conf.d
 mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
 
 #Configure Php-Fpm
-rm -rf /etc/php8/php-fpm.d/*
-mv /opt/Setup/Configs/php.conf /etc/php8/php-fpm.d/heimdall.conf
-mv /opt/Setup/Configs/phpTimezone.ini /etc/php8/conf.d/04_date_timezone.ini
+rm -rf /etc/php81/php-fpm.d/*
+mv /opt/Setup/Configs/php.conf /etc/php81/php-fpm.d/heimdall.conf
+mv /opt/Setup/Configs/phpTimezone.ini /etc/php81/conf.d/04_date_timezone.ini
 
 #Install Heimdall
 git clone -b 2.x https://github.com/linuxserver/Heimdall.git /opt/heimdall
diff --git a/CT-Files/nextcloud/Scripts/FirstRun.sh b/CT-Files/nextcloud/Scripts/FirstRun.sh
index 43fe8fe..905a4d0 100644
--- a/CT-Files/nextcloud/Scripts/FirstRun.sh
+++ b/CT-Files/nextcloud/Scripts/FirstRun.sh
@@ -18,24 +18,24 @@ if [ $ThisScriptConfigured = no ]; then
     echo  "Script is not configured"
     exit
 fi
-sudo -u nginx php8 /opt/nextcloud/occ maintenance:install --database mysql --database-name "$MysqlDatabase" --database-host "$MysqlIP" --database-port "$MysqlPort" --database-user "$MysqlUsername" --database-pass "$MysqlPassword" --database-table-space "" --admin-user "$NextcloudUsername" --admin-pass "$NexcloudPassword" --data-dir /var/nextcloud
+sudo -u nginx php81 /opt/nextcloud/occ maintenance:install --database mysql --database-name "$MysqlDatabase" --database-host "$MysqlIP" --database-port "$MysqlPort" --database-user "$MysqlUsername" --database-pass "$MysqlPassword" --database-table-space "" --admin-user "$NextcloudUsername" --admin-pass "$NexcloudPassword" --data-dir /var/nextcloud
 
 sed -n -i  '/#SetupBlockStart/{:a;N;/#SetupBlockEnd/!ba;N;s/.*//};p' /etc/nginx/nginx.conf
 service nginx reload
 
-sudo -u nginx php8 /opt/nextcloud/occ db:convert-filecache-bigint
-sudo -u nginx php8 /opt/nextcloud/occ db:add-missing-indices
-#sudo -u nginx php8 /opt/nextcloud/occ app:disable firstrunwizard
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set default_language --value=nl
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set default_locale --value=nl
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set default_phone_region --value=nl
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set skeletondirectory --value=
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\APCu'
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set trashbin_retention_obligation --value=30,30
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis'
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis'
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set redis host --value=localhost
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set redis port --value=6379
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set trusted_domains 1 --value="$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)"
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set overwrite.cli.url --value="$NextcloudWebProto://$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)"
-sudo -u nginx php8 /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto"
\ No newline at end of file
+sudo -u nginx php81 /opt/nextcloud/occ db:convert-filecache-bigint
+sudo -u nginx php81 /opt/nextcloud/occ db:add-missing-indices
+#sudo -u nginx php81 /opt/nextcloud/occ app:disable firstrunwizard
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_language --value=nl
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_locale --value=nl
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_phone_region --value=nl
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set skeletondirectory --value=
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\APCu'
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set trashbin_retention_obligation --value=30,30
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis'
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis'
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set redis host --value=localhost
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set redis port --value=6379
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set trusted_domains 1 --value="$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)"
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set overwrite.cli.url --value="$NextcloudWebProto://$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)"
+sudo -u nginx php81 /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto"
\ No newline at end of file
diff --git a/CT-Files/nextcloud/Scripts/Init.sh b/CT-Files/nextcloud/Scripts/Init.sh
index bd60d0a..4e5e94c 100644
--- a/CT-Files/nextcloud/Scripts/Init.sh
+++ b/CT-Files/nextcloud/Scripts/Init.sh
@@ -7,12 +7,12 @@ rm -rf /etc/nginx/conf.d
 mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
 
 #Configure Php-Cli
-sed -i '/memory_limit =/c\memory_limit = 512M' /etc/php8/php.ini
+sed -i '/memory_limit =/c\memory_limit = 512M' /etc/php81/php.ini
 
 #Configure Php-Fpm
-rm -rf /etc/php8/php-fpm.d/*
-mv /opt/Setup/Configs/php.conf /etc/php8/php-fpm.d/nextcloud.conf
-mv /opt/Setup/Configs/phpTimezone.ini /etc/php8/conf.d/04_date_timezone.ini
+rm -rf /etc/php81/php-fpm.d/*
+mv /opt/Setup/Configs/php.conf /etc/php81/php-fpm.d/nextcloud.conf
+mv /opt/Setup/Configs/phpTimezone.ini /etc/php81/conf.d/04_date_timezone.ini
 
 #Install Nextcloud
 mkdir /opt/nextcloud /var/nextcloud
@@ -20,8 +20,8 @@ tar jxf  /opt/Setup/nextcloud.tar.bz2 -C /opt/nextcloud --strip 1
 rm -rf /opt/Setup/nextcloud.tar.bz2
 chown -R nginx:nginx /opt/nextcloud
 chown -R nginx:nginx /var/nextcloud
-echo "*/5  *  *  *  *  php8 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx
-echo "apc.enable_cli=1" >> /etc/php8/php.ini
+echo "*/5  *  *  *  *  php81 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx
+echo "apc.enable_cli=1" >> /etc/php81/php.ini
 #Enable services on boot
 rc-update add nginx
 rc-update add php-fpm8
diff --git a/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh b/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh
index ae41326..2ee193b 100644
--- a/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh
+++ b/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 # Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
-sudo -u nginx php8 /opt/nextcloud/updater/updater.phar --no-interaction
\ No newline at end of file
+sudo -u nginx php81 /opt/nextcloud/updater/updater.phar --no-interaction
\ No newline at end of file