From 8884f41414548935b911a5a1707f39a994a4ae82 Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Fri, 29 Sep 2023 14:50:02 +0200
Subject: [PATCH 01/11] add logic to migrate from php8.0 to php8.1

---
 conf/nginx-top.conf           |  2 +-
 management/backup.py          |  7 +++--
 management/utils.py           |  4 +++
 management/web_update.py      |  3 +-
 setup/functions.sh            |  7 +++--
 setup/nextcloud.sh            | 52 ++++++++++++++++++++++++++++++++---
 setup/system.sh               |  4 ---
 setup/web.sh                  |  4 ++-
 setup/webmail.sh              |  2 ++
 setup/zpush.sh                |  2 ++
 tools/owncloud-restore.sh     |  7 +++--
 tools/owncloud-unlockadmin.sh |  2 +-
 12 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/conf/nginx-top.conf b/conf/nginx-top.conf
index c3f4c0d6..12622593 100644
--- a/conf/nginx-top.conf
+++ b/conf/nginx-top.conf
@@ -7,6 +7,6 @@
 ##       your own --- please do not ask for help from us.
 
 upstream php-fpm {
-	server unix:/var/run/php/php8.0-fpm.sock;
+	server unix:/var/run/php/php{{phpver}}-fpm.sock;
 }
 
diff --git a/management/backup.py b/management/backup.py
index c2ef7676..41dfa2cc 100755
--- a/management/backup.py
+++ b/management/backup.py
@@ -12,7 +12,7 @@ import dateutil.parser, dateutil.relativedelta, dateutil.tz
 import rtyaml
 from exclusiveprocess import Lock
 
-from utils import load_environment, shell, wait_for_service
+from utils import load_environment, shell, wait_for_service, get_php_version
 
 def backup_status(env):
 	# If backups are dissbled, return no status.
@@ -262,6 +262,7 @@ def get_target_type(config):
 
 def perform_backup(full_backup):
 	env = load_environment()
+	php_fpm = f"php{get_php_version()}-fpm"
 
 	# Create an global exclusive lock so that the backup script
 	# cannot be run more than one.
@@ -297,7 +298,7 @@ def perform_backup(full_backup):
 			if quit:
 				sys.exit(code)
 
-	service_command("php8.0-fpm", "stop", quit=True)
+	service_command(php_fpm, "stop", quit=True)
 	service_command("postfix", "stop", quit=True)
 	service_command("dovecot", "stop", quit=True)
 	service_command("postgrey", "stop", quit=True)
@@ -334,7 +335,7 @@ def perform_backup(full_backup):
 		service_command("postgrey", "start", quit=False)
 		service_command("dovecot", "start", quit=False)
 		service_command("postfix", "start", quit=False)
-		service_command("php8.0-fpm", "start", quit=False)
+		service_command(php_fpm, "start", quit=False)
 
 	# Remove old backups. This deletes all backup data no longer needed
 	# from more than 3 days ago.
diff --git a/management/utils.py b/management/utils.py
index b5ca7e59..f249c420 100644
--- a/management/utils.py
+++ b/management/utils.py
@@ -178,6 +178,10 @@ def wait_for_service(port, public, env, timeout):
 				return False
 		time.sleep(min(timeout/4, 1))
 
+def get_php_version():
+	# Gets the version of PHP installed in the system.
+	return shell("check_output", ["/usr/bin/php", "-v"])[4:7]
+
 if __name__ == "__main__":
 	from web_update import get_web_domains
 	env = load_environment()
diff --git a/management/web_update.py b/management/web_update.py
index e23bb2d8..03498730 100644
--- a/management/web_update.py
+++ b/management/web_update.py
@@ -7,7 +7,7 @@ import os.path, re, rtyaml
 from mailconfig import get_mail_domains
 from dns_update import get_custom_dns_config, get_dns_zones
 from ssl_certificates import get_ssl_certificates, get_domain_ssl_files, check_certificate
-from utils import shell, safe_domain_name, sort_domains
+from utils import shell, safe_domain_name, sort_domains, get_php_version
 
 def get_web_domains(env, include_www_redirects=True, include_auto=True, exclude_dns_elsewhere=True):
 	# What domains should we serve HTTP(S) for?
@@ -83,6 +83,7 @@ def do_web_update(env):
 
 	# Build an nginx configuration file.
 	nginx_conf = read_conf("nginx-top.conf")
+	nginx_conf = re.sub("{{phpver}}", get_php_version(), nginx_conf)
 
 	# Load the templates.
 	template0 = read_conf("nginx.conf")
diff --git a/setup/functions.sh b/setup/functions.sh
index 151c5f40..6e5d0556 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -4,8 +4,6 @@
 # -o pipefail: don't ignore errors in the non-last command in a pipeline
 set -euo pipefail
 
-PHP_VER=8.0
-
 function hide_output {
 	# This function hides the output of a command unless the command fails
 	# and returns a non-zero exit code.
@@ -222,3 +220,8 @@ function git_clone {
 	mv $TMPPATH/$SUBDIR $TARGETPATH
 	rm -rf $TMPPATH
 }
+
+function php_version {
+	php --version | head -n 1 | cut -d " " -f 2 | cut -c 1-3
+}
+
diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index a2d9d2e5..98eec849 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -48,10 +48,12 @@ user_external_hash=a494073dcdecbbbc79a9c77f72524ac9994d2eec
 
 apt-get purge -qq -y owncloud* # we used to use the package manager
 
-apt_install curl php${PHP_VER} php${PHP_VER}-fpm \
-	php${PHP_VER}-cli php${PHP_VER}-sqlite3 php${PHP_VER}-gd php${PHP_VER}-imap php${PHP_VER}-curl \
-	php${PHP_VER}-dev php${PHP_VER}-gd php${PHP_VER}-xml php${PHP_VER}-mbstring php${PHP_VER}-zip php${PHP_VER}-apcu \
-	php${PHP_VER}-intl php${PHP_VER}-imagick php${PHP_VER}-gmp php${PHP_VER}-bcmath
+apt_install curl php8.1 php8.1-fpm \
+	php8.1-cli php8.1-sqlite3 php8.1-gd php8.1-imap php8.1-curl \
+	php8.1-dev php8.1-xml php8.1-mbstring php8.1-zip php8.1-apcu \
+	php8.1-intl php8.1-imagick php8.1-gmp php8.1-bcmath
+
+PHP_VER=$(php_version)
 
 # Enable APC before Nextcloud tools are run.
 tools/editconf.py /etc/php/$PHP_VER/mods-available/apcu.ini -c ';' \
@@ -195,6 +197,32 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 			return 0
 		fi
 
+		# Install php 8.0 for older versions of nextcloud that don't support 8.1
+		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^2[0123] ]]; then
+			# Version 20 is the latest version from the 18.04 version of miab. To upgrade to version 21, install php8.0. This is
+			# not supported by version 20, but that does not matter, as the InstallNextcloud function only runs the version 21 code.
+			# We need php 8.0 for nextcloud 21-23, as php 8.1 is supported starting nextcloud 24
+			
+			# Install the ppa
+			add-apt-repository --yes ppa:ondrej/php
+			
+			# Prevent installation of old packages
+			apt-mark hold php7.0-apcu php7.1-apcu php7.2-apcu php7.3-apcu php7.4-apcu
+			
+			# Install older php version
+			apt_install php8.0 php8.0-fpm php8.0-apcu php8.0-cli php8.0-sqlite3 php8.0-gd php8.0-imap \
+				php8.0-curl php8.0-dev php8.0-xml php8.0-mbstring php8.0-zip
+			
+			# set older php version as default
+			update-alternatives --set php /usr/bin/php8.0
+
+			PHP_VER=$(php_version)
+
+			# Make sure apc is enabled
+			tools/editconf.py /etc/php/$PHP_VER/mods-available/apcu.ini -c ';' \
+				apc.enabled=1	\
+				apc.enable_cli=1
+		fi
 		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^20 ]]; then
 			InstallNextcloud 21.0.7 f5c7079c5b56ce1e301c6a27c0d975d608bb01c9 4.0.7 45e7cf4bfe99cd8d03625cf9e5a1bb2e90549136 3.0.4 d0284b68135777ec9ca713c307216165b294d0fe
 			CURRENT_NEXTCLOUD_VER="21.0.7"
@@ -211,6 +239,22 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 			InstallNextcloud 24.0.12 7aa5d61632c1ccf4ca3ff00fb6b295d318c05599 4.1.0 697f6b4a664e928d72414ea2731cb2c9d1dc3077 3.2.2 ce4030ab57f523f33d5396c6a81396d440756f5f 3.0.0 0df781b261f55bbde73d8c92da3f99397000972f
 			CURRENT_NEXTCLOUD_VER="24.0.12"
 		fi
+		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^2[45678] ]]; then
+			# From nextcloud 24 and higher, php8.1 is supported, so we can now remove the php8.0 ppa and packages
+			
+			# Reset the default php version used
+			update-alternatives --auto php
+			
+			PHP_VER=$(php_version)
+
+			# Remove older php version
+			apt-get purge -qq -y php8.0 php8.0-fpm php8.0-apcu php8.0-cli php8.0-sqlite3 php8.0-gd \
+				php8.0-imap php8.0-curl php8.0-dev php8.0-xml php8.0-mbstring php8.0-zip \
+				php8.0-common php8.0-opcache php8.0-readline
+			
+			# Remove the ppa
+			add-apt-repository --yes --remove ppa:ondrej/php
+		fi
 	fi
 
 	InstallNextcloud $nextcloud_ver $nextcloud_hash $contacts_ver $contacts_hash $calendar_ver $calendar_hash $user_external_ver $user_external_hash
diff --git a/setup/system.sh b/setup/system.sh
index 216c2cd8..48e3ded6 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -100,10 +100,6 @@ hide_output add-apt-repository -y universe
 # Install the duplicity PPA.
 hide_output add-apt-repository -y ppa:duplicity-team/duplicity-release-git
 
-# Stock PHP is now 8.1, but we're transitioning through 8.0 because
-# of Nextcloud.
-hide_output add-apt-repository --y ppa:ondrej/php
-
 # ### Update Packages
 
 # Update system packages to make sure we have the latest upstream versions
diff --git a/setup/web.sh b/setup/web.sh
index 392b6d92..cc47708c 100755
--- a/setup/web.sh
+++ b/setup/web.sh
@@ -19,10 +19,12 @@ fi
 
 echo "Installing Nginx (web server)..."
 
-apt_install nginx php${PHP_VER}-cli php${PHP_VER}-fpm idn2
+apt_install nginx php8.1-cli php8.1-fpm idn2
 
 rm -f /etc/nginx/sites-enabled/default
 
+PHP_VER=$(php_version)
+
 # Copy in a nginx configuration file for common and best-practices
 # SSL settings from @konklone. Replace STORAGE_ROOT so it can find
 # the DH params.
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 0be0e1f8..5d5acee8 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -5,6 +5,8 @@
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
+PHP_VER=$(php_version)
+
 # ### Installing Roundcube
 
 # We install Roundcube from sources, rather than from Ubuntu, because:
diff --git a/setup/zpush.sh b/setup/zpush.sh
index 51b197ff..0b19a9b8 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -13,6 +13,8 @@
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
+PHP_VER=$(php_version)
+
 # Prereqs.
 
 echo "Installing Z-Push (Exchange/ActiveSync server)..."
diff --git a/tools/owncloud-restore.sh b/tools/owncloud-restore.sh
index cdeec4e9..62986f6d 100755
--- a/tools/owncloud-restore.sh
+++ b/tools/owncloud-restore.sh
@@ -26,7 +26,10 @@ if [ ! -f $1/config.php ]; then
 fi
 
 echo "Restoring backup from $1"
-service php8.0-fpm stop
+
+PHP_VER=$(php_version)
+
+service php$PHP_VER-fpm stop
 
 # remove the current ownCloud/Nextcloud installation
 rm -rf /usr/local/lib/owncloud/
@@ -45,5 +48,5 @@ chown www-data:www-data $STORAGE_ROOT/owncloud/config.php
 
 sudo -u www-data php$PHP_VER /usr/local/lib/owncloud/occ maintenance:mode --off
 
-service php8.0-fpm start
+service php$PHP_VER-fpm start
 echo "Done"
diff --git a/tools/owncloud-unlockadmin.sh b/tools/owncloud-unlockadmin.sh
index 0b7ffc9c..89e5dd7d 100755
--- a/tools/owncloud-unlockadmin.sh
+++ b/tools/owncloud-unlockadmin.sh
@@ -19,5 +19,5 @@ echo If in doubt, press CTRL-C to cancel.
 echo 
 echo Press enter to continue.
 read
-
+PHP_VER=$(php_version)
 sudo -u www-data php$PHP_VER /usr/local/lib/owncloud/occ group:adduser admin $ADMIN && echo Done.

From 3559488e3ef1a14be353e52acd507df4326a5d48 Mon Sep 17 00:00:00 2001
From: matidau <65836048+matidau@users.noreply.github.com>
Date: Fri, 16 Aug 2024 15:26:37 +1000
Subject: [PATCH 02/11] z-push admin and top update with PHP_VER change

---
 setup/zpush.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/setup/zpush.sh b/setup/zpush.sh
index 3b14c047..acab2a12 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -41,18 +41,18 @@ if [ $needs_update == 1 ]; then
 	mv /tmp/z-push/*/src /usr/local/lib/z-push
 	rm -rf /tmp/z-push.zip /tmp/z-push
 
-	# Create admin and top scripts with PHP_VER  
-	rm -f /usr/sbin/z-push-{admin,top}
-    echo '#!/bin/bash' > /usr/sbin/z-push-admin
-    echo php"$PHP_VER" /usr/local/lib/z-push/z-push-admin.php '"$@"' >> /usr/sbin/z-push-admin
-    chmod 755 /usr/sbin/z-push-admin
-    echo '#!/bin/bash' > /usr/sbin/z-push-top
-    echo php"$PHP_VER" /usr/local/lib/z-push/z-push-top.php '"$@"' >> /usr/sbin/z-push-top
-    chmod 755 /usr/sbin/z-push-top
-	
 	echo $VERSION > /usr/local/lib/z-push/version
 fi
 
+# Create admin and top scripts with PHP_VER  
+rm -f /usr/sbin/z-push-{admin,top}
+echo '#!/bin/bash' > /usr/sbin/z-push-admin
+echo php"$PHP_VER" /usr/local/lib/z-push/z-push-admin.php '"$@"' >> /usr/sbin/z-push-admin
+chmod 755 /usr/sbin/z-push-admin
+echo '#!/bin/bash' > /usr/sbin/z-push-top
+echo php"$PHP_VER" /usr/local/lib/z-push/z-push-top.php '"$@"' >> /usr/sbin/z-push-top
+chmod 755 /usr/sbin/z-push-top
+
 # Configure default config.
 sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/config.php
 sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php

From cac493fcf317013c3694cdb8e716f5a0caeaf604 Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Wed, 12 Feb 2025 15:38:30 +0100
Subject: [PATCH 03/11] Hardcode PHP version

---
 management/utils.py           |  3 +--
 setup/functions.sh            |  7 ++-----
 setup/nextcloud.sh            | 35 +++++++++++++----------------------
 setup/system.sh               |  4 ++++
 setup/web.sh                  |  4 +---
 setup/webmail.sh              |  2 --
 setup/zpush.sh                |  2 --
 tools/owncloud-restore.sh     |  4 +---
 tools/owncloud-unlockadmin.sh |  5 +++--
 9 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/management/utils.py b/management/utils.py
index 73d834a0..3f872376 100644
--- a/management/utils.py
+++ b/management/utils.py
@@ -180,8 +180,7 @@ def wait_for_service(port, public, env, timeout):
 		time.sleep(min(timeout/4, 1))
 
 def get_php_version():
-	# Gets the version of PHP installed in the system.
-	return shell("check_output", ["/usr/bin/php", "-v"])[4:7]
+	return "8.1"
 
 def get_ssh_port():
 	port_value = get_ssh_config_value("port")
diff --git a/setup/functions.sh b/setup/functions.sh
index 02abda8e..85925e6c 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -5,6 +5,8 @@
 # -o pipefail: don't ignore errors in the non-last command in a pipeline
 set -euo pipefail
 
+PHP_VER=8.1
+
 function hide_output {
 	# This function hides the output of a command unless the command fails
 	# and returns a non-zero exit code.
@@ -221,8 +223,3 @@ function git_clone {
 	mv $TMPPATH/"$SUBDIR" "$TARGETPATH"
 	rm -rf $TMPPATH
 }
-
-function php_version {
-	php --version | head -n 1 | cut -d " " -f 2 | cut -c 1-3
-}
-
diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index 93c62ecc..b788498c 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -65,12 +65,10 @@ user_external_hash=280d24eb2a6cb56b4590af8847f925c28d8d853e
 # Clear prior packages and install dependencies from apt.
 apt-get purge -qq -y owncloud* # we used to use the package manager
 
-apt_install curl php8.1 php8.1-fpm \
-	php8.1-cli php8.1-sqlite3 php8.1-gd php8.1-imap php8.1-curl \
-	php8.1-dev php8.1-xml php8.1-mbstring php8.1-zip php8.1-apcu \
-	php8.1-intl php8.1-imagick php8.1-gmp php8.1-bcmath
-
-PHP_VER=$(php_version)
+apt_install curl php"${PHP_VER}" php"${PHP_VER}"-fpm \
+	php"${PHP_VER}"-cli php"${PHP_VER}"-sqlite3 php"${PHP_VER}"-gd php"${PHP_VER}"-imap php"${PHP_VER}"-curl \
+	php"${PHP_VER}"-dev php"${PHP_VER}"-xml php"${PHP_VER}"-mbstring php"${PHP_VER}"-zip php"${PHP_VER}"-apcu \
+	php"${PHP_VER}"-intl php"${PHP_VER}"-imagick php"${PHP_VER}"-gmp php"${PHP_VER}"-bcmath
 
 # Enable APC before Nextcloud tools are run.
 tools/editconf.py /etc/php/"$PHP_VER"/mods-available/apcu.ini -c ';' \
@@ -222,20 +220,15 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 			# not supported by version 20, but that does not matter, as the InstallNextcloud function only runs the version 21 code.
 			# We need php 8.0 for nextcloud 21-23, as php 8.1 is supported starting nextcloud 24
 			
-			# Install the ppa
-			add-apt-repository --yes ppa:ondrej/php
-			
 			# Prevent installation of old packages
 			apt-mark hold php7.0-apcu php7.1-apcu php7.2-apcu php7.3-apcu php7.4-apcu
 			
-			# Install older php version
+			# Install php version 8.0
 			apt_install php8.0 php8.0-fpm php8.0-apcu php8.0-cli php8.0-sqlite3 php8.0-gd php8.0-imap \
 				php8.0-curl php8.0-dev php8.0-xml php8.0-mbstring php8.0-zip
 			
-			# set older php version as default
-			update-alternatives --set php /usr/bin/php8.0
-
-			PHP_VER=$(php_version)
+			# set php version 8.0 as default
+			PHP_VER=8.0
 
 			# Make sure apc is enabled
 			tools/editconf.py /etc/php/$PHP_VER/mods-available/apcu.ini -c ';' \
@@ -259,22 +252,20 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 			InstallNextcloud 24.0.12 7aa5d61632c1ccf4ca3ff00fb6b295d318c05599 4.1.0 697f6b4a664e928d72414ea2731cb2c9d1dc3077 3.2.2 ce4030ab57f523f33d5396c6a81396d440756f5f 3.0.0 0df781b261f55bbde73d8c92da3f99397000972f
 			CURRENT_NEXTCLOUD_VER="24.0.12"
 		fi
-		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^2[45678] ]]; then
+
+		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^2[45] ]]; then
 			# From nextcloud 24 and higher, php8.1 is supported, so we can now remove the php8.0 ppa and packages
 			
 			# Reset the default php version used
-			update-alternatives --auto php
-			
-			PHP_VER=$(php_version)
+			PHP_VER=8.1
 
 			# Remove older php version
 			apt-get purge -qq -y php8.0 php8.0-fpm php8.0-apcu php8.0-cli php8.0-sqlite3 php8.0-gd \
 				php8.0-imap php8.0-curl php8.0-dev php8.0-xml php8.0-mbstring php8.0-zip \
 				php8.0-common php8.0-opcache php8.0-readline
-			
-			# Remove the ppa
-			add-apt-repository --yes --remove ppa:ondrej/php
-        if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^24 ]]; then
+		fi
+
+		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^24 ]]; then
 			InstallNextcloud 25.0.7 a5a565c916355005c7b408dd41a1e53505e1a080 5.3.0 4b0a6666374e3b55cfd2ae9b72e1d458b87d4c8c 4.4.2 21a42e15806adc9b2618760ef94f1797ef399e2f 3.2.0 a494073dcdecbbbc79a9c77f72524ac9994d2eec
 			CURRENT_NEXTCLOUD_VER="25.0.7"
 		fi
diff --git a/setup/system.sh b/setup/system.sh
index 8c38c5be..fce3091f 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -110,6 +110,10 @@ hide_output add-apt-repository -y universe
 # Install the duplicity PPA.
 hide_output add-apt-repository -y ppa:duplicity-team/duplicity-release-git
 
+# Stock PHP is now 8.1, but we're transitioning through 8.0 because
+# of Nextcloud.
+hide_output add-apt-repository --y ppa:ondrej/php
+
 # ### Update Packages
 
 # Update system packages to make sure we have the latest upstream versions
diff --git a/setup/web.sh b/setup/web.sh
index 9e890636..3aafcd88 100755
--- a/setup/web.sh
+++ b/setup/web.sh
@@ -19,12 +19,10 @@ fi
 
 echo "Installing Nginx (web server)..."
 
-apt_install nginx php8.1-cli php8.1-fpm idn2
+apt_install nginx php"${PHP_VER}"-cli php"${PHP_VER}"-fpm idn2
 
 rm -f /etc/nginx/sites-enabled/default
 
-PHP_VER=$(php_version)
-
 # Copy in a nginx configuration file for common and best-practices
 # SSL settings from @konklone. Replace STORAGE_ROOT so it can find
 # the DH params.
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 3d5ebc0b..a203cb8c 100644
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -5,8 +5,6 @@
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
-PHP_VER=$(php_version)
-
 # ### Installing Roundcube
 
 # We install Roundcube from sources, rather than from Ubuntu, because:
diff --git a/setup/zpush.sh b/setup/zpush.sh
index 8cfa86d5..397ee4a9 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -13,8 +13,6 @@
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
-PHP_VER=$(php_version)
-
 # Prereqs.
 
 echo "Installing Z-Push (Exchange/ActiveSync server)..."
diff --git a/tools/owncloud-restore.sh b/tools/owncloud-restore.sh
index 8ed6adea..ce3b3c9e 100755
--- a/tools/owncloud-restore.sh
+++ b/tools/owncloud-restore.sh
@@ -2,6 +2,7 @@
 #
 # This script will restore the backup made during an installation
 source /etc/mailinabox.conf # load global vars
+source ./setup/functions.sh
 
 if [ -z "$1" ]; then
 	echo "Usage: owncloud-restore.sh <backup directory>"
@@ -26,9 +27,6 @@ if [ ! -f "$1/config.php" ]; then
 fi
 
 echo "Restoring backup from $1"
-
-PHP_VER=$(php_version)
-
 service php$PHP_VER-fpm stop
 
 # remove the current ownCloud/Nextcloud installation
diff --git a/tools/owncloud-unlockadmin.sh b/tools/owncloud-unlockadmin.sh
index db444c82..24e2e756 100755
--- a/tools/owncloud-unlockadmin.sh
+++ b/tools/owncloud-unlockadmin.sh
@@ -7,8 +7,9 @@
 # purpopses only. After this point you are on your own.
 
 source /etc/mailinabox.conf # load global vars
+source ./setup/functions.sh
 
-ADMIN=$(./mail.py user admins | head -n 1)
+ADMIN=$(sudo ./management/cli.py user admins | head -n 1)
 test -z "$1" || ADMIN=$1
 
 echo "I am going to unlock admin features for $ADMIN."
@@ -19,5 +20,5 @@ echo "If in doubt, press CTRL-C to cancel."
 echo
 echo "Press enter to continue."
 read
-PHP_VER=$(php_version)
+
 sudo -u www-data "php$PHP_VER" /usr/local/lib/owncloud/occ group:adduser admin "$ADMIN" && echo "Done."

From 87deed6459a1f8ee660364a3eb9e034b4b798db0 Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Sat, 15 Feb 2025 15:09:59 +0100
Subject: [PATCH 04/11] Use local variable to indicat PHP version to be used

---
 setup/nextcloud.sh | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index b788498c..d31951f7 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -62,6 +62,9 @@ user_external_hash=280d24eb2a6cb56b4590af8847f925c28d8d853e
 # 5.3 You still can create, edit and delete users
 # 5.4 Go to Administration > Logs and ensure no new errors are shown
 
+# Set a local variable for the PHP version
+NC_PHP_VER=PHP_VER
+
 # Clear prior packages and install dependencies from apt.
 apt-get purge -qq -y owncloud* # we used to use the package manager
 
@@ -138,23 +141,23 @@ InstallNextcloud() {
 	if [ -e "$STORAGE_ROOT/owncloud/owncloud.db" ]; then
 		# ownCloud 8.1.1 broke upgrades. It may fail on the first attempt, but
 		# that can be OK.
-		sudo -u www-data php"$PHP_VER" /usr/local/lib/owncloud/occ upgrade
+		sudo -u www-data php"$NC_PHP_VER" /usr/local/lib/owncloud/occ upgrade
 		E=$?
 		if [ $E -ne 0 ] && [ $E -ne 3 ]; then
 			echo "Trying ownCloud upgrade again to work around ownCloud upgrade bug..."
-			sudo -u www-data php"$PHP_VER" /usr/local/lib/owncloud/occ upgrade
+			sudo -u www-data php"$NC_PHP_VER" /usr/local/lib/owncloud/occ upgrade
 			E=$?
 			if [ $E -ne 0 ] && [ $E -ne 3 ]; then exit 1; fi
-			sudo -u www-data php"$PHP_VER" /usr/local/lib/owncloud/occ maintenance:mode --off
+			sudo -u www-data php"$NC_PHP_VER" /usr/local/lib/owncloud/occ maintenance:mode --off
 			echo "...which seemed to work."
 		fi
 
 		# Add missing indices. NextCloud didn't include this in the normal upgrade because it might take some time.
-		sudo -u www-data php"$PHP_VER" /usr/local/lib/owncloud/occ db:add-missing-indices
-		sudo -u www-data php"$PHP_VER" /usr/local/lib/owncloud/occ db:add-missing-primary-keys
+		sudo -u www-data php"$NC_PHP_VER" /usr/local/lib/owncloud/occ db:add-missing-indices
+		sudo -u www-data php"$NC_PHP_VER" /usr/local/lib/owncloud/occ db:add-missing-primary-keys
 
 		# Run conversion to BigInt identifiers, this process may take some time on large tables.
-		sudo -u www-data php"$PHP_VER" /usr/local/lib/owncloud/occ db:convert-filecache-bigint --no-interaction
+		sudo -u www-data php"$NC_PHP_VER" /usr/local/lib/owncloud/occ db:convert-filecache-bigint --no-interaction
 	fi
 }
 
@@ -219,19 +222,19 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 			# Version 20 is the latest version from the 18.04 version of miab. To upgrade to version 21, install php8.0. This is
 			# not supported by version 20, but that does not matter, as the InstallNextcloud function only runs the version 21 code.
 			# We need php 8.0 for nextcloud 21-23, as php 8.1 is supported starting nextcloud 24
-			
+
 			# Prevent installation of old packages
 			apt-mark hold php7.0-apcu php7.1-apcu php7.2-apcu php7.3-apcu php7.4-apcu
-			
+
 			# Install php version 8.0
 			apt_install php8.0 php8.0-fpm php8.0-apcu php8.0-cli php8.0-sqlite3 php8.0-gd php8.0-imap \
 				php8.0-curl php8.0-dev php8.0-xml php8.0-mbstring php8.0-zip
-			
+
 			# set php version 8.0 as default
-			PHP_VER=8.0
+			NC_PHP_VER=8.0
 
 			# Make sure apc is enabled
-			tools/editconf.py /etc/php/$PHP_VER/mods-available/apcu.ini -c ';' \
+			tools/editconf.py /etc/php/$NC_PHP_VER/mods-available/apcu.ini -c ';' \
 				apc.enabled=1	\
 				apc.enable_cli=1
 		fi
@@ -255,9 +258,9 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 
 		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^2[45] ]]; then
 			# From nextcloud 24 and higher, php8.1 is supported, so we can now remove the php8.0 ppa and packages
-			
+
 			# Reset the default php version used
-			PHP_VER=8.1
+			NC_PHP_VER=8.1
 
 			# Remove older php version
 			apt-get purge -qq -y php8.0 php8.0-fpm php8.0-apcu php8.0-cli php8.0-sqlite3 php8.0-gd \

From 36dc5ffcee3ef673bed583b62eb7bb777e16c33a Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Sun, 16 Feb 2025 11:55:19 +0100
Subject: [PATCH 05/11] Fix missing $

---
 setup/nextcloud.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index d31951f7..b0509bbc 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -63,7 +63,7 @@ user_external_hash=280d24eb2a6cb56b4590af8847f925c28d8d853e
 # 5.4 Go to Administration > Logs and ensure no new errors are shown
 
 # Set a local variable for the PHP version
-NC_PHP_VER=PHP_VER
+NC_PHP_VER=$PHP_VER
 
 # Clear prior packages and install dependencies from apt.
 apt-get purge -qq -y owncloud* # we used to use the package manager

From c559974d8c9b482d8036a9c5b1aa641b593923e8 Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Sat, 22 Feb 2025 13:43:05 +0100
Subject: [PATCH 06/11] make sure php cleanup runs on nextcloud upgrade

---
 setup/nextcloud.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index b0509bbc..cc280b40 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -256,7 +256,7 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 			CURRENT_NEXTCLOUD_VER="24.0.12"
 		fi
 
-		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^2[45] ]]; then
+		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^2[456] ]]; then
 			# From nextcloud 24 and higher, php8.1 is supported, so we can now remove the php8.0 ppa and packages
 
 			# Reset the default php version used

From 0a4599956cc2c20b4c39c270420839ebc8477bf5 Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Sat, 22 Feb 2025 23:06:07 +0100
Subject: [PATCH 07/11] Make sure to unhold packages to prevent future issues

---
 setup/nextcloud.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index cc280b40..d368c77b 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -266,6 +266,9 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 			apt-get purge -qq -y php8.0 php8.0-fpm php8.0-apcu php8.0-cli php8.0-sqlite3 php8.0-gd \
 				php8.0-imap php8.0-curl php8.0-dev php8.0-xml php8.0-mbstring php8.0-zip \
 				php8.0-common php8.0-opcache php8.0-readline
+				
+			# Unhold packages
+			apt-mark unhold php7.0-apcu php7.1-apcu php7.2-apcu php7.3-apcu php7.4-apcu
 		fi
 
 		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^24 ]]; then

From 5c02ea3752b590e21e4339e460063c9986ff876d Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Thu, 27 Feb 2025 11:12:49 +0100
Subject: [PATCH 08/11] Add comments on aligning used php version

---
 management/utils.py      | 2 ++
 management/web_update.py | 1 +
 setup/functions.sh       | 1 +
 3 files changed, 4 insertions(+)

diff --git a/management/utils.py b/management/utils.py
index 3f872376..f2df5ad0 100644
--- a/management/utils.py
+++ b/management/utils.py
@@ -180,6 +180,8 @@ def wait_for_service(port, public, env, timeout):
 		time.sleep(min(timeout/4, 1))
 
 def get_php_version():
+	# Gets the version of PHP used by Mail-in-a-Box
+	# To modify PHP version, also update variable PHP_VER in functions.sh
 	return "8.1"
 
 def get_ssh_port():
diff --git a/management/web_update.py b/management/web_update.py
index ba853468..cef15f6e 100644
--- a/management/web_update.py
+++ b/management/web_update.py
@@ -82,6 +82,7 @@ def do_web_update(env):
 
 	# Build an nginx configuration file.
 	nginx_conf = read_conf("nginx-top.conf")
+	# Hardcode php version in the nginx configuration file
 	nginx_conf = re.sub("{{phpver}}", get_php_version(), nginx_conf)
 
 	# Load the templates.
diff --git a/setup/functions.sh b/setup/functions.sh
index 85925e6c..46355dde 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -5,6 +5,7 @@
 # -o pipefail: don't ignore errors in the non-last command in a pipeline
 set -euo pipefail
 
+# To modify PHP version, also update method get_php_version() in utils.py
 PHP_VER=8.1
 
 function hide_output {

From 8e7b4b501d4d7f3530f3a4790482676536a78579 Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Thu, 27 Feb 2025 11:13:12 +0100
Subject: [PATCH 09/11] Removed unneeded sudo call

---
 tools/owncloud-unlockadmin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/owncloud-unlockadmin.sh b/tools/owncloud-unlockadmin.sh
index 24e2e756..5618ddd4 100755
--- a/tools/owncloud-unlockadmin.sh
+++ b/tools/owncloud-unlockadmin.sh
@@ -9,7 +9,7 @@
 source /etc/mailinabox.conf # load global vars
 source ./setup/functions.sh
 
-ADMIN=$(sudo ./management/cli.py user admins | head -n 1)
+ADMIN=$(./management/cli.py user admins | head -n 1)
 test -z "$1" || ADMIN=$1
 
 echo "I am going to unlock admin features for $ADMIN."

From da6a204adfd18e4e0d593f0a0b5266a47f2d2b8a Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Sun, 2 Mar 2025 22:33:53 +0100
Subject: [PATCH 10/11] add quotes around variable

---
 tools/owncloud-restore.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/owncloud-restore.sh b/tools/owncloud-restore.sh
index ce3b3c9e..be273749 100755
--- a/tools/owncloud-restore.sh
+++ b/tools/owncloud-restore.sh
@@ -46,5 +46,5 @@ chown www-data:www-data "$STORAGE_ROOT/owncloud/config.php"
 
 sudo -u www-data "php$PHP_VER" /usr/local/lib/owncloud/occ maintenance:mode --off
 
-service php$PHP_VER-fpm start
+service "php$PHP_VER-fpm" start
 echo "Done"

From 6adc494e491c39096689b4cf0386dd2b2ac5254b Mon Sep 17 00:00:00 2001
From: KiekerJan <kiekerjan@users.noreply.github.com>
Date: Mon, 3 Mar 2025 19:35:54 +0100
Subject: [PATCH 11/11] Add quotes

---
 tools/owncloud-restore.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/owncloud-restore.sh b/tools/owncloud-restore.sh
index be273749..7288e63c 100755
--- a/tools/owncloud-restore.sh
+++ b/tools/owncloud-restore.sh
@@ -27,7 +27,7 @@ if [ ! -f "$1/config.php" ]; then
 fi
 
 echo "Restoring backup from $1"
-service php$PHP_VER-fpm stop
+service "php$PHP_VER-fpm" stop
 
 # remove the current ownCloud/Nextcloud installation
 rm -rf /usr/local/lib/owncloud/