Upgrade OS --> 26.04

enoch85 · enoch85 · commit 5d576f878ea3 · 2026-05-05T22:04:44.000Z
- Bump supported Ubuntu range to 24.04 - 26.04 (Resolute Raccoon)
- PHP 8.3 -&gt; 8.5, PostgreSQL 16 -&gt; 18 (defaults on 26.04)
- Centralize version checks in lib.sh: SUPPORTED_VERSION_MIN/MAX,
  LATEST_VERSION (derived), SUPPORTED_CODENAMES — single source of truth
- Make check_php() fully dynamic (regex on `php -v`, /etc/php fallback)
- Replace hardcoded stop_if_installed lists with brace-expansion loops
  covering php7.0-7.9, php8.0-8.9 and postgresql-9.x through postgresql-30

Signed-off-by: enoch85 &lt;mailto@danielhansson.nu&gt;
diff --git a/README.md b/README.md
@@ -17,12 +17,12 @@ Server installation. Simplified. :cloud:
 --------------------
 
 ## Dependencies:
-(Ubuntu Server 24.04 LTS *minimal* 64-bit)
+(Ubuntu Server 26.04 LTS *minimal* 64-bit)
 <br>
-(Linux Kernel: 6.8)
+(Linux Kernel: 7.0)
 - Apache 2.4
-- PostgreSQL 16
-- PHP-FPM 8.3
+- PostgreSQL 18
+- PHP-FPM 8.5
 - Redis Memcache (Ubuntu package)
 - PHP-igbinary (Ubuntu package)
 - PHP-smbclient (Ubuntu package)
diff --git a/addons/redis-server-ubuntu.sh b/addons/redis-server-ubuntu.sh
@@ -16,9 +16,9 @@ debug_mode
 root_check
 
 # Check Ubuntu version
-if ! version 18.04 "$DISTRO" 24.04.10
+if ! version 18.04 "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - 24.04.10 to run this script."
+    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - $SUPPORTED_VERSION_MAX to run this script."
     msg_box "Please contact us to get support for upgrading your server:
 https://www.hanssonit.se/#contact
 https://shop.hanssonit.se/"
diff --git a/apps/adminneo.sh b/apps/adminneo.sh
@@ -92,8 +92,8 @@ fi
 
 print_text_in_color "$IGreen" "AdminNeo ${ADMINNEO_VERSION} successfully downloaded!"
 
-# Only add TLS 1.3 on Ubuntu later than 22.04
-if version 22.04 "$DISTRO" 24.04.10
+# Only add TLS 1.3 on supported Ubuntu releases
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     TLS13="+TLSv1.3"
 fi
diff --git a/apps/collabora_docker.sh b/apps/collabora_docker.sh
@@ -135,8 +135,8 @@ a2enmod proxy_http
 a2enmod ssl
 a2enmod headers
 
-# Only add TLS 1.3 on Ubuntu later than 22.04
-if version 22.04 "$DISTRO" 24.04.10
+# Only add TLS 1.3 on supported Ubuntu releases
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     TLS13="+TLSv1.3"
 fi
diff --git a/apps/onlyoffice_docker.sh b/apps/onlyoffice_docker.sh
@@ -152,8 +152,8 @@ a2enmod proxy_http
 a2enmod ssl
 a2enmod headers
 
-# Only add TLS 1.3 on Ubuntu later than 22.04
-if version 22.04 "$DISTRO" 24.04.10
+# Only add TLS 1.3 on supported Ubuntu releases
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     TLS13="+TLSv1.3"
 fi
diff --git a/apps/pico_cms.sh b/apps/pico_cms.sh
@@ -214,8 +214,8 @@ a2enmod proxy_http
 a2enmod ssl
 a2enmod headers
 
-# Only add TLS 1.3 on Ubuntu later than 22.04
-if version 22.04 "$DISTRO" 24.04.10
+# Only add TLS 1.3 on supported Ubuntu releases
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     TLS13="+TLSv1.3"
 fi
diff --git a/apps/smbmount.sh b/apps/smbmount.sh
@@ -350,14 +350,14 @@ We please you to do the math yourself if the number is high enough for your setu
             # Get installed php version
             check_php
             # Enable Inotify
-            if [ ! -f $PHP_MODS_DIR/inotify.ini ]
+            if [ ! -f "$PHP_MODS_DIR"/inotify.ini ]
             then
-                touch $PHP_MODS_DIR/inotify.ini
+                touch "$PHP_MODS_DIR"/inotify.ini
             fi
-            if ! grep -qFx extension=inotify.so $PHP_MODS_DIR/inotify.ini
+            if ! grep -qFx extension=inotify.so "$PHP_MODS_DIR"/inotify.ini
             then
-                echo "# PECL inotify" > $PHP_MODS_DIR/inotify.ini
-                echo "extension=inotify.so" >> $PHP_MODS_DIR/inotify.ini
+                echo "# PECL inotify" > "$PHP_MODS_DIR"/inotify.ini
+                echo "extension=inotify.so" >> "$PHP_MODS_DIR"/inotify.ini
                 check_command phpenmod -v ALL inotify
             fi
 
diff --git a/apps/talk.sh b/apps/talk.sh
@@ -93,10 +93,10 @@ else
     removal_popup "$SCRIPT_NAME"
 fi
 
-# Must be 24.04
-if ! version 22.04 "$DISTRO" 24.04.10
+# Must be on a supported Ubuntu release
+if ! version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 22.04 - 24.04.10 to install Talk"
+    msg_box "Your current Ubuntu version is $DISTRO but must be between $SUPPORTED_VERSION_MIN - $SUPPORTED_VERSION_MAX to install Talk"
     msg_box "Please contact us to get support for upgrading your server:
 https://www.hanssonit.se/#contact
 https://shop.hanssonit.se/"
@@ -444,8 +444,8 @@ mkdir -p /var/www/html/error
 echo "Hi there! :) If you see this page, the Apache2 proxy for $SCRIPT_NAME is up and running." > /var/www/html/error/404_proxy.html
 chown -R www-data:www-data /var/www/html/error
 
-# Only add TLS 1.3 on Ubuntu later than 22.04
-if version 22.04 "$DISTRO" 24.04.10
+# Only add TLS 1.3 on supported Ubuntu releases
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     TLS13="+TLSv1.3"
 fi
diff --git a/apps/tmbitwarden.sh b/apps/tmbitwarden.sh
@@ -240,8 +240,8 @@ a2enmod ssl
 a2enmod headers
 a2enmod remoteip
 
-# Only add TLS 1.3 on Ubuntu later than 22.04
-if version 22.04 "$DISTRO" 24.04.10
+# Only add TLS 1.3 on supported Ubuntu releases
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     TLS13="+TLSv1.3"
 fi
diff --git a/apps/vaultwarden.sh b/apps/vaultwarden.sh
@@ -122,8 +122,8 @@ a2enmod ssl
 a2enmod headers
 a2enmod remoteip
 
-# Only add TLS 1.3 on Ubuntu later than 22.04
-if version 22.04 "$DISTRO" 24.04.10
+# Only add TLS 1.3 on supported Ubuntu releases
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     TLS13="+TLSv1.3"
 fi
diff --git a/apps/webmin.sh b/apps/webmin.sh
@@ -52,7 +52,6 @@ install_if_not libauthen-pam-perl
 install_if_not libpam-runtime
 install_if_not libio-pty-perl
 install_if_not apt-show-versions
-install_if_not python2
 install_if_not unzip
 install_if_not shared-mime-info
 install_if_not zip
diff --git a/disk/change-to-zfs-mount-generator.sh b/disk/change-to-zfs-mount-generator.sh
@@ -18,7 +18,7 @@ source /var/scripts/fetch_lib.sh
 # Check if root
 root_check
 
-# Needs to be Ubuntu 22.04 and Multiverse
+# Needs a supported Ubuntu release (see lib.sh) and Multiverse
 check_distro_version
 check_multiverse
 
diff --git a/disk/format-chosen.sh b/disk/format-chosen.sh
@@ -10,7 +10,7 @@ source /var/scripts/fetch_lib.sh
 # Check if root
 root_check
 
-# Needs to be Ubuntu 22.04 and Multiverse
+# Needs a supported Ubuntu release (see lib.sh) and Multiverse
 check_distro_version
 check_multiverse
 
diff --git a/disk/format-sdb.sh b/disk/format-sdb.sh
@@ -10,7 +10,7 @@ source /var/scripts/fetch_lib.sh
 # Check if root
 root_check
 
-# Needs to be Ubuntu 22.04 and Multiverse
+# Needs a supported Ubuntu release (see lib.sh) and Multiverse
 check_distro_version
 check_multiverse
 
diff --git a/lets-encrypt/activate-tls.sh b/lets-encrypt/activate-tls.sh
@@ -115,21 +115,21 @@ fi
 # To get the correct version for the Apache conf file
 check_php
 
-# Only add TLS 1.3 on Ubuntu later than 22.04
-if version 22.04 "$DISTRO" 24.04.10
+# Only add TLS 1.3 on supported Ubuntu releases
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     TLS13="+TLSv1.3"
 fi
 
 # Fix zero file sizes
 # See https://github.com/nextcloud/server/issues/3056
-if version 24.04 "$DISTRO" 26.04.10
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     SETENVPROXY="SetEnv proxy-sendcl 1"
 fi
 
 # Install Brotli
-if version 24.04 "$DISTRO" 26.04.10
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     if ! [ -f /etc/apache2/conf-available/brotli.conf ]
     then
diff --git a/lib.sh b/lib.sh
@@ -161,8 +161,14 @@ HTTP2_CONF="/etc/apache2/mods-available/http2.conf"
 GEOBLOCK_MOD_CONF="/etc/apache2/conf-available/geoblock.conf"
 GEOBLOCK_MOD="/etc/apache2/mods-available/maxminddb.load"
 GEOBLOCK_DIR="/usr/share/GeoIP"
+# Supported Ubuntu range — single source of truth. Bump these on the next OS upgrade.
+SUPPORTED_VERSION_MIN=24.04
+SUPPORTED_VERSION_MAX=26.04.10
+# Latest release without the trailing point version (e.g. 26.04.10 -> 26.04)
+LATEST_VERSION="${SUPPORTED_VERSION_MAX%.*}"
+SUPPORTED_CODENAMES=(noble resolute)
 # PHP-FPM
-PHPVER=8.3
+PHPVER=8.5
 PHP_FPM_DIR=/etc/php/$PHPVER/fpm
 PHP_INI=$PHP_FPM_DIR/php.ini
 PHP_POOL_DIR=$PHP_FPM_DIR/pool.d
@@ -874,10 +880,10 @@ version(){
 
     [[ $2 != "$h" && $2 != "$t" ]]
 }
-if ! version 22.04 "$DISTRO" 24.04.10
+if ! version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     print_text_in_color "$IRed" "Your current Ubuntu version is $DISTRO but must be between \
-22.04 - 24.04.10 to run this script."
+$SUPPORTED_VERSION_MIN - $SUPPORTED_VERSION_MAX to run this script."
     print_text_in_color "$ICyan" "Please contact us for support upgrading your server:"
     print_text_in_color "$ICyan" "https://www.hanssonit.se/#contact"
     print_text_in_color "$ICyan" "https://shop.hanssonit.se/"
@@ -1233,19 +1239,14 @@ remove_from_trusted_domains() {
 }
 
 check_distro_version() {
-# Support Ubuntu 22.04 jammy, and Ubuntu 24.04 noble.
+# Supported Ubuntu codenames are listed in $SUPPORTED_CODENAMES (lib.sh).
 
-# Check Ubuntu version
-if [ "${CODENAME}" == "jammy" ] || [ "${CODENAME}" == "noble" ]
-then
-    OS=1
-elif lsb_release -i | grep -ic "Ubuntu" &> /dev/null
-then
-    OS=1
-elif uname -a | grep -ic "jammy" &> /dev/null || uname -a | grep -ic "noble" &> /dev/null
-then
-    OS=1
-elif uname -v | grep -ic "Ubuntu" &> /dev/null
+# Check Ubuntu version: codename match, or any Ubuntu identifier in lsb_release/uname.
+local CODENAMES_RE
+CODENAMES_RE="$(IFS='|'; echo "${SUPPORTED_CODENAMES[*]}")"
+if [[ " ${SUPPORTED_CODENAMES[*]} " == *" $CODENAME "* ]] \
+   || lsb_release -ds 2>/dev/null | grep -Eiq "ubuntu|$CODENAMES_RE" \
+   || uname -a | grep -Eiq "ubuntu|$CODENAMES_RE"
 then
     OS=1
 fi
@@ -1259,8 +1260,8 @@ You can find the download link here: https://www.ubuntu.com/download/server"
     exit 1
 fi
 
-if ! version 22.04 "$DISTRO" 24.04.10; then
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 22.04 - 24.04.10 to run this script."
+if ! version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"; then
+    msg_box "Your current Ubuntu version is $DISTRO but must be between $SUPPORTED_VERSION_MIN - $SUPPORTED_VERSION_MAX to run this script."
     msg_box "Please contact us to get support for upgrading your server:
 https://www.hanssonit.se/#contact
 https://shop.hanssonit.se/product/upgrade-ubuntu-os-between-major-versions/"
@@ -1419,7 +1420,7 @@ version(){
 
     [[ $2 != "$h" && $2 != "$t" ]]
 }
-if version 22.04 "$DISTRO" 24.04.10
+if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
 then
     print_text_in_color "$ICyan" "Testing if network is OK..."
     if site_200 github.com
@@ -1444,7 +1445,7 @@ then
         fi
     fi
 else
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 22.04 - 24.04.10 to run this script."
+    msg_box "Your current Ubuntu version is $DISTRO but must be between $SUPPORTED_VERSION_MIN - $SUPPORTED_VERSION_MAX to run this script."
     msg_box "Please contact us to get support for upgrading your server:
 https://www.hanssonit.se/#contact
 https://shop.hanssonit.se/"
@@ -2242,51 +2243,24 @@ does_snapshot_exist() {
 
 check_php() {
 print_text_in_color "$ICyan" "Getting current PHP-version..."
-GETPHP="$(php -v | grep -m 1 PHP | awk '{print $2}' | cut -d '-' -f1)"
+# Extract MAJOR.MINOR (e.g. "8.5") from `php -v`. Works for any future PHP version
+# without needing to extend a hardcoded list.
+GETPHP="$(php -v 2>/dev/null | grep -m 1 -oE '^PHP [0-9]+\.[0-9]+' | awk '{print $2}')"
+
+# Fallback: pick the highest /etc/php/X.Y directory if `php -v` failed (e.g. CLI not installed yet)
+if [ -z "$GETPHP" ] && [ -d /etc/php ]
+then
+    GETPHP="$(find /etc/php -mindepth 1 -maxdepth 1 -type d -printf '%f\n' 2>/dev/null \
+        | grep -E '^[0-9]+\.[0-9]+$' | sort -V | tail -n1)"
+fi
 
 if [ -z "$GETPHP" ]
 then
     print_text_in_color "$IRed" "Can't find proper PHP version, aborting..."
     exit 1
 fi
 
-if grep 7.0 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=7.0
-elif grep 7.1 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=7.1
-elif grep 7.2 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=7.2
-elif grep 7.3 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=7.3
-elif grep 7.4 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=7.4
-elif grep 8.0 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=8.0
-elif grep 8.1 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=8.1
-elif grep 8.2 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=8.2
-elif grep 8.3 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=8.3
-elif grep 8.4 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=8.4
-elif grep 8.5 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=8.5
-elif grep 8.6 <<< "$GETPHP" >/dev/null 2>&1
-then
-   export PHPVER=8.6
-fi
+export PHPVER="$GETPHP"
 
 # Export other PHP variables based on PHPVER
 export PHP_FPM_DIR=/etc/php/$PHPVER/fpm
@@ -2339,14 +2313,14 @@ add_trusted_key_and_repo() {
     # $1 = whatever.asc
     # $2 = Key URL e.g. https://download.webmin.com
     # $3 = Deb URL e.g. https://download.webmin.com/download/repository
-    # $4 = "$CODENAME $CODENAME main" (e.g. jammy jammy main)
+    # $4 = "$CODENAME $CODENAME main" (e.g. noble noble main)
     # $5 = debpackage-name.list
 
     # This function is only supported in the currently supported release
     check_distro_version
 
     # Do the magic
-    if version 22.04 "$DISTRO" 24.04.10
+    if version "$SUPPORTED_VERSION_MIN" "$DISTRO" "$SUPPORTED_VERSION_MAX"
     then
         # New recommended way not using apt-key
         print_text_in_color "$ICyan" "Adding trusted key in /etc/apt/keyrings/$1..."
diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh
diff --git a/nextcloud_update.sh b/nextcloud_update.sh
diff --git a/not-supported/pi-hole.sh b/not-supported/pi-hole.sh
diff --git a/vagrant/README.md b/vagrant/README.md
