22.04 (#83)

enoch85 · web-flow · commit f49552fda277 · 2023-01-28T11:41:31.000+01:00
Signed-off-by: Daniel Hansson &lt;mailto@danielhansson.nu&gt;
diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@
 ### https://www.techandme.se
 ### https://www.hanssonit.se/wordpress-vm/
 
-- Ubuntu 20.04 Server
-- MariaDB 10.6
+- Ubuntu 22.04 Server
+- MariaDB 11.0
 - NGINX 1.18
-- PHP-FPM 7.4
+- PHP-FPM 8.1
 - Latest Wordpress (updates automatically)
 - WP-CLI
 - Redis Cache
diff --git a/addons/automatic_updates.sh b/addons/automatic_updates.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/addons/locales.sh b/addons/locales.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059,1091
 true
diff --git a/addons/locate_mirror.sh b/addons/locate_mirror.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/addons/redis-server-ubuntu.sh b/addons/redis-server-ubuntu.sh
@@ -5,7 +5,7 @@ SCRIPT_NAME="Redis Server Ubuntu"
 # shellcheck source=lib.sh
 source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/techandme/wordpress-vm/master/lib.sh)
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # Check for errors + debug code and abort if something isn't right
 # 1 = ON
@@ -17,9 +17,9 @@ debug_mode
 root_check
 
 # Check Ubuntu version
-if ! version 16.04 "$DISTRO" 20.04.6
+if ! version 18.04 "$DISTRO" 22.04.10
 then
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 16.04 - 20.04.6 to run this script."
+    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - 22.04.10 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/addons/smtp-mail.sh b/addons/smtp-mail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/apps/adminer.sh b/apps/adminer.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/apps/bpytop.sh b/apps/bpytop.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/apps/fail2ban.sh b/apps/fail2ban.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 # Inspired by https://github.com/nextcloud/nextcloudpi/blob/master/etc/nextcloudpi-config.d/fail2ban.sh
 
 # shellcheck disable=2034,2059
diff --git a/apps/midnight-commander.sh b/apps/midnight-commander.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
-# Copyright © 2020 Simon Lindner (https://github.com/szaimen)
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
+# Copyright © 2023 Simon Lindner (https://github.com/szaimen)
 
 # shellcheck disable=2034,2059
 true
diff --git a/apps/netdata.sh b/apps/netdata.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/apps/webmin.sh b/apps/webmin.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/lets-encrypt/activate-tls.sh b/lets-encrypt/activate-tls.sh
@@ -5,7 +5,7 @@ SCRIPT_NAME="Activate TLS"
 # shellcheck source=lib.sh
 source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/techandme/wordpress-vm/master/lib.sh)
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # Check for errors + debug code and abort if something isn't right
 # 1 = ON
diff --git a/lets-encrypt/test-new-config.sh b/lets-encrypt/test-new-config.sh
@@ -5,7 +5,7 @@ SCRIPT_NAME="Test New Configuration"
 # shellcheck source=lib.sh
 source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/techandme/wordpress-vm/master/lib.sh)
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # Check for errors + debug code and abort if something isn't right
 # 1 = ON
diff --git a/lib.sh b/lib.sh
@@ -130,7 +130,7 @@ NGINX_CONF="/etc/nginx/nginx.conf"
 NGINX_DEF="$SITES_AVAILABLE/default"
 
 # PHP-FPM
-PHPVER=7.4
+PHPVER=8.1
 PHP_FPM_DIR=/etc/php/$PHPVER/fpm
 PHP_INI=$PHP_FPM_DIR/php.ini
 PHP_POOL_DIR=$PHP_FPM_DIR/pool.d
@@ -485,10 +485,10 @@ version(){
 
     [[ $2 != "$h" && $2 != "$t" ]]
 }
-if ! version 18.04 "$DISTRO" 20.04.6
+if ! version 20.04 "$DISTRO" 22.04.10
 then
     print_text_in_color "$IRed" "Your current Ubuntu version is $DISTRO but must be between \
-18.04 - 20.04.4 to run this script."
+20.04 - 22.04.10 to run this script."
     print_text_in_color "$ICyan" "Please contact us to get support for upgrading your server:"
     print_text_in_color "$ICyan" "https://www.hanssonit.se/#contact"
     print_text_in_color "$ICyan" "https://shop.hanssonit.se/"
@@ -589,7 +589,7 @@ local  tls_alpn_01="certbot certonly --preferred-challenges tls-alpn-01 $default
 local  dns="certbot certonly --manual --manual-public-ip-logging-ok --preferred-challenges dns $default_le"
 local  methods=(standalone dns)
 
-for f in ${methods[*]}
+for f in "${methods[@]}"
 do
     print_text_in_color "${ICyan}" "Trying to generate certs and validate them with $f method."
     current_method=""
@@ -711,8 +711,8 @@ You can find the download link here: https://www.ubuntu.com/download/server"
     exit 1
 fi
 
-if ! version 18.04 "$DISTRO" 20.04.4; then
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - 20.04.4 to run this script."
+if ! version 20.04 "$DISTRO" 22.04.10; then
+    msg_box "Your current Ubuntu version is $DISTRO but must be between 20.04 - 22.04.10 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/"
@@ -807,7 +807,7 @@ version(){
 
     [[ $2 != "$h" && $2 != "$t" ]]
 }
-if version 18.04 "$DISTRO" 20.04.6
+if version 20.04 "$DISTRO" 22.04.10
 then
     print_text_in_color "$ICyan" "Testing if network is OK..."
     if ! netplan apply
@@ -828,7 +828,7 @@ then
         fi
     fi
 else
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - 20.04.6 to run this script."
+    msg_box "Your current Ubuntu version is $DISTRO but must be between 20.04 - 22.04.6 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/"
@@ -1042,9 +1042,13 @@ then
    export PHPVER=7.4
 elif grep 8.0 <<< "$GETPHP" >/dev/null 2>&1
 then
-#   export PHPVER=8.0
-    msg_box "Sorry, but PHP 8 is not supported yet."
-    exit 1
+   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
 fi
 
 export PHP_INI=/etc/php/"$PHPVER"/fpm/php.ini
diff --git a/menu/additional_apps.sh b/menu/additional_apps.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/menu/fail2ban_menu.sh b/menu/fail2ban_menu.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2021, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 true
 SCRIPT_NAME="Fail2ban Menu"
diff --git a/menu/main_menu.sh b/menu/main_menu.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059,1091
 true
diff --git a/menu/menu.sh b/menu/menu.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059,1091
 true
diff --git a/menu/server_configuration.sh b/menu/server_configuration.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/menu/startup_configuration.sh b/menu/startup_configuration.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # shellcheck disable=2034,2059
 true
diff --git a/network/ddclient-configuration.sh b/network/ddclient-configuration.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
-# Copyright © 2020 Simon Lindner (https://github.com/szaimen)
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
+# Copyright © 2023 Simon Lindner (https://github.com/szaimen)
 
 # shellcheck disable=2034,2059
 true
diff --git a/network/static_ip.sh b/network/static_ip.sh
@@ -1,19 +1,17 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # Use local lib file in case there is no internet connection
 if printf "Testing internet connection..." && ping github.com -c 2 >/dev/null 2>&1
 then
-# shellcheck disable=2034,2059
 true
 SCRIPT_NAME="Static IP"
 # shellcheck source=lib.sh
 source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/techandme/wordpress-vm/master/lib.sh)
  # If we have internet, then use the latest variables from the lib remote file
 elif [ -f /var/scripts/lib.sh ]
 then
-# shellcheck disable=2034,2059
 true
 SCRIPT_NAME="Static IP"
 # shellcheck source=lib.sh
@@ -167,7 +165,7 @@ Just hit enter to choose the current NS1.\nYour current NS1 is: $DNS1")
         done
     fi
 
-    # Check if DNS is set manaully and set variables accordingly
+    # Check if DNS is set manually and set variables accordingly
     if [ -n "$NSIP1" ]
     then
         DNSs="$NSIP1"
@@ -188,15 +186,18 @@ network:
        $IFACE: #object name
          dhcp4: false # dhcp v4 disable
          dhcp6: false # dhcp v6 disable
-         addresses: [$LANIP] # client IP address
-         gateway4: $GATEWAYIP # gateway address
+         addresses: 
+         - $LANIP
+         routes:
+          - to: default
+            via: $GATEWAYIP
          nameservers:
-           addresses: [$DNSs] #name servers
+           addresses: [$DNSs]
 IPCONFIG
 
         msg_box "These are your settings, please make sure they are correct:
 
-$(cat /etc/netplan/01-netcfg.yaml)"
+$(cat /etc/netplan/wordpress.yaml)"
         netplan try
         set_systemd_resolved_dns "$IFACE"
     else
@@ -207,23 +208,27 @@ network:
        $IFACE2: #object name
          dhcp4: false # dhcp v4 disable
          dhcp6: false # dhcp v6 disable
-         addresses: [$LANIP] # client IP address
-         gateway4: $GATEWAY # gateway address
+         addresses: 
+         - $LANIP
+         routes:
+          - to: default
+            via: $GATEWAYIP
          nameservers:
-           addresses: [$DNSs] #name servers
+           addresses: [$DNSs]
 IPCONFIGnonvmware
 
         msg_box "These are your settings, please make sure they are correct:
 
-$(cat /etc/netplan/01-netcfg.yaml)"
+$(cat /etc/netplan/wordpress.yaml)"
         netplan try
         set_systemd_resolved_dns "$IFACE2"
     fi
 
     if test_connection
     then
         sleep 1
-        msg_box "Static IP sucessfully set!"
+        msg_box "Static IP successfully set!"
+        rm -f /etc/netplan/00-installer-config.yaml
         break
     fi
 
diff --git a/static/adduser.sh b/static/adduser.sh
@@ -5,7 +5,7 @@ SCRIPT_NAME="Add CLI User"
 # shellcheck source=lib.sh
 source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/techandme/wordpress-vm/master/lib.sh)
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # Check for errors + debug code and abort if something isn't right
 # 1 = ON
diff --git a/static/change_db_pass.sh b/static/change_db_pass.sh
@@ -5,7 +5,7 @@ SCRIPT_NAME="Change Database Password"
 # shellcheck source=lib.sh
 source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/techandme/wordpress-vm/master/lib.sh)
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 # Check for errors + debug code and abort if something isn't right
 # 1 = ON
diff --git a/static/wordpress_update.sh b/static/wordpress_update.sh
@@ -34,7 +34,7 @@ https://shop.hanssonit.se/product/premium-support-per-30-minutes/"
     fi
 fi
 
-# Ubuntu 16.04 is deprecated
+# Ubuntu 18.04 is deprecated
 check_distro_version
 
 # Make sure VMLOGS are present
@@ -75,7 +75,7 @@ then
     fi
 fi
 
-# Update Redis PHP extension (18.04 --> 20.04 since 16.04 already is deprecated in the top of this script)
+# Update Redis PHP extension (20.04 --> 20.04 since 18.04 already is deprecated in the top of this script)
 print_text_in_color "$ICyan" "Trying to upgrade the Redis PECL extension..."
 
 # Check current PHP version
diff --git a/wordpress-startup-script.sh b/wordpress-startup-script.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2020, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
 
 #########
 
diff --git a/wordpress_install.sh b/wordpress_install.sh
