Merge branch 'main' into staging/fixes

Author: ScIT-Raphael

CHANGELOG.md

@@ -9,11 +9,12 @@ All notable changes to this project will be documented in this file.
     - `UPGRADE_SEND_EMAIL` = Sends an email notification to admin email address
     - `UPGRADE_SEND_EMAIL_LOG` = Sends installation log output to admin email address
 - Upgrade process will now save logs to the `hst_backups` directory.
-- Support for removing backup remote location (#1083)
+- Support for removing backup remote location (#1083).
 - Add support Proftpd TLS Support
-- Add the possibility to assign user "Administrators" rights on login. Replaces "root" login. Notifications are only send towards the "admin" account email
-- Updated translations system with the use of Gettext. Modified / Updated all translated strings
-- Use php7.4 as default
+- Add the possibility to assign user "Administrators" rights on login. Replaces "root" login. Notifications are only send towards the "admin" account email.
+- Updated translations system with the use of Gettext. Modified / Updated all translated strings.
+- Use php7.4 as default version.
+- Updated MariaDB to 10.5 (Manual upgrade required install/upgrade/manual/upgrade_mariadb.sh).
 
 ## Bugfixes
 - Removed root login (root / root password )

bin/v-backup-user

@@ -209,6 +209,26 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
             fi
         fi
 
+        domain_conf=$(grep "DOMAIN='$domain'" $conf)
+        parse_object_kv_list_non_eval domain_conf
+        
+        mkdir -p template/$WEB_SYSTEM/
+        mkdir template/php-fpm/
+        
+        if [ $WEB_BACKEND == 'php-fpm' ]; then 
+            cp $HESTIA/data/templates/web/$WEB_SYSTEM/php-fpm/$TPL.tpl template/$WEB_SYSTEM/
+            cp $HESTIA/data/templates/web/$WEB_SYSTEM/php-fpm/$TPL.stpl template/$WEB_SYSTEM/
+            cp $HESTIA/data/templates/web/php-fpm/$BACKEND.tpl template/php-fpm/
+        else
+            cp $HESTIA/data/templates/web/$WEB_SYSTEM/$TPL.tpl template/$WEB_SYSTEM/
+            cp $HESTIA/data/templates/web/$WEB_SYSTEM/$TPL.stpl template/$WEB_SYSTEM/   
+        fi
+        if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
+            mkdir  template/$PROXY_SYSTEM
+            cp $HESTIA/data/templates/web/$PROXY_SYSTEM/$PROXY.tpl template/$PROXY_SYSTEM/
+            cp $HESTIA/data/templates/web/$PROXY_SYSTEM/$PROXY.stpl template/$PROXY_SYSTEM/      
+        fi
+        
         # Backup custom config / backup LE config
         for sconfig in $(ls $HOMEDIR/$user/conf/web/|grep ".$domain.conf"); do
             cp $HOMEDIR/$user/conf/web/$sconfig conf/
@@ -545,6 +565,7 @@ if [ "$USER" != '*' ]; then
             tee -a $BACKUP/$user.log
     fi
 fi
+
 if [ "$BACKUP_MODE" = 'zstd' ]; then
     touch $tmpdir/.zstd
 fi

install/hst-install-debian.sh

@@ -27,7 +27,7 @@ HESTIA_INSTALL_VER='1.3.0~beta'
 pma_v='5.0.2'
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
 fpm_v="7.4"
-mariadb_v="10.4"
+mariadb_v="10.5"
 
 if [ "$release" -eq 9 ]; then
     software="nginx apache2 apache2-utils apache2-suexec-custom

install/hst-install-ubuntu.sh

@@ -27,7 +27,7 @@ HESTIA_INSTALL_VER='1.3.0~beta'
 pma_v='5.0.2'
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
 fpm_v="7.4"
-mariadb_v="10.4"
+mariadb_v="10.5"
 
 # Defining software pack for all distros
 software="apache2 apache2.2-common apache2-suexec-custom apache2-utils

install/upgrade/manual/upgrade_mariadb.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-# This script validates and upgrades the MariaDB version to 10.4
+# This script validates and upgrades the MariaDB version to 10.5
 
 # Set MariaDB Target Version
-mariadb_v='10.4'
+mariadb_v='10.5'
 
 # Load OS informations
 source /etc/os-release
@@ -31,10 +31,10 @@ fi
 echo "Add new MariaDB repository..."
 apt="/etc/apt/sources.list.d/"
 if [ "$id" = "ubuntu" ]; then
-    echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
+    echo "deb [arch=amd64] https://mirror.mva-n.net/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
     APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 > /dev/null 2>&1
 else
-    echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
+    echo "deb [arch=amd64] https://mirror.mva-n.net/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
     if [ "$id" = "jessie" ]; then
         APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com CBCB082A1BB943DB > /dev/null 2>&1
     else