Merge pull request #1227 from hestiacp/staging/fixes

Staging/fixes

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
-- Updated MariaDB to 10.5 (Manual upgrade required install/upgrade/manual/upgrade_mariadb.sh)
+- 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-add-sys-filemanager

@@ -52,13 +52,6 @@ if [ ! -f "$COMPOSER_BIN" ]; then
     fi
 fi
 
-# Ensure PHP 7.3 is installed before continuing
-if [ ! -f "/usr/bin/php7.3" ]; then
-    $BIN/v-add-user-notification admin 'File Manager installation failed!' '<b>Unable to proceed with installation of File Manager.</b><br><br>Package <b>php7.3-cli</b> is missing from your system. Please check your PHP installation and environment settings.'
-    echo "ERROR: PHP 7.3 not installed on your system, aborting."
-    exit 1
-fi
-
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
 
@@ -81,7 +74,7 @@ cp --recursive --force ${HESTIA_INSTALL_DIR}/filemanager/filegator/* "${FM_INSTA
 
 chown $user: -R "${FM_INSTALL_DIR}"
 
-COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php7.3 $COMPOSER_BIN --quiet --no-dev install
+COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php $COMPOSER_BIN --quiet --no-dev install
 
 # Check if installation was successful, if not abort script and throw error message notification and clean-up
 if [ $? -ne 0 ]; then

bin/v-restore-user

@@ -591,7 +591,7 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
         format_domain_idn
 
         # Restoring emails
-        if [ $BACKUP_MODE = 'zstd' ]; then    
+        if [ $backup_mode = 'zstd' ]; then    
             if [ -e "$tmpdir/mail/$domain/accounts.tar.zst" ]; then
                 chmod u+w "$HOMEDIR/$user/mail/$domain_idn"
                 $BIN/v-extract-fs-archive "$user" "$tmpdir/mail/$domain/accounts.tar.zst" "$HOMEDIR/$user/mail/$domain_idn/"
@@ -696,7 +696,7 @@ if [ "$db" != 'no' ] && [ ! -z "$DB_SYSTEM" ]; then
         fi
 
         # Unzipping database dump
-        if [ $BACKUP_MODE = 'zstd' ]; then  
+        if [ $backup_mode = 'zstd' ]; then  
             zstd -d $tmpdir/db/$database/$database.*.sql.zst
         else
             gzip -d $tmpdir/db/$database/$database.*.sql.gz
@@ -759,7 +759,7 @@ if [ "$udir" != 'no' ]; then
 
         # Creating user dir restore list
         backup_dirs=$(tar -tf $BACKUP/$backup |grep "^./user_dir")
-        if [ $BACKUP_MODE = 'zstd' ]; then 
+        if [ $backup_mode = 'zstd' ]; then 
             backup_dirs=$(echo "$backup_dirs" |grep tar.zst)
             backup_dirs=$(echo "$backup_dirs" |cut -f 3 -d /)
             backup_dirs=$(echo "$backup_dirs" |sed "s/.tar.zst//")
@@ -777,7 +777,7 @@ if [ "$udir" != 'no' ]; then
 
         for user_dir in $user_dirs; do
             echo -e "$(date "+%F %T") $user_dir" |tee -a $tmpdir/restore.log
-            if [ $BACKUP_MODE = 'zstd' ]; then 
+            if [ $backup_mode = 'zstd' ]; then 
                 tar xf "$BACKUP/$backup" -C "$tmpdir" --no-wildcards "./user_dir/$user_dir.tar.zst"
             else
                 tar xf "$BACKUP/$backup" -C "$tmpdir" --no-wildcards "./user_dir/$user_dir.tar.gz"
@@ -793,7 +793,7 @@ if [ "$udir" != 'no' ]; then
             chown "$user" "$tmpdir/user_dir"
             chown "$user" "$HOMEDIR/$user"
             [ -e "$HOMEDIR/$user/$user_dir" ] && chown "$user" "$HOMEDIR/$user/$user_dir"
-            if [ $BACKUP_MODE = 'zstd' ]; then
+            if [ $backup_mode = 'zstd' ]; then
                 $BIN/v-extract-fs-archive "$user" "$tmpdir/user_dir/$user_dir.tar.zst" "$HOMEDIR/$user"
             else
                 $BIN/v-extract-fs-archive "$user" "$tmpdir/user_dir/$user_dir.tar.gz" "$HOMEDIR/$user"

install/hst-install-debian.sh

@@ -26,7 +26,7 @@ VERBOSE='no'
 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.3"
+fpm_v="7.4"
 mariadb_v="10.5"
 
 if [ "$release" -eq 9 ]; then

install/hst-install-ubuntu.sh

@@ -26,7 +26,7 @@ VERBOSE='no'
 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.3"
+fpm_v="7.4"
 mariadb_v="10.5"
 
 # Defining software pack for all distros