Improve upgrade procedure (hestiacp#2198)

* Improve upgrade procedure

1. Allow setting task on version 
Use upgrade_config_set_value Setting flag
2. Check version has changed instead of flag on dependencies

* Improve config var exsits

* Create /var/log/hestia/backup.log + chmod /backup/user.log

Author: jaapmarcus

bin/v-add-sys-filemanager

@@ -105,7 +105,7 @@ fi
 # Add configuration file
 cp -f $HESTIA_INSTALL_DIR/filemanager/filegator/configuration.php $HESTIA/web/fm/configuration.php
 
-
+echo "$fm_v" > "${FM_INSTALL_DIR}/version"
 # Set permissions
 chown root: -R "${FM_INSTALL_DIR}"
 chown $user: "${FM_INSTALL_DIR}/private"

bin/v-backup-user

@@ -770,6 +770,7 @@ echo "$backup_str" >> $USER_DATA/backup.conf
 tail -n $BACKUPS $USER_DATA/backup.conf > $USER_DATA/backup.conf_
 mv -f $USER_DATA/backup.conf_ $USER_DATA/backup.conf
 chmod 660 $USER_DATA/backup.conf
+chmod 660 $BACKUP/$user.log
 
 # Deleting task from queue
 sed -i "/v-backup-user $user /d" $HESTIA/data/queue/backup.pipe
@@ -783,10 +784,11 @@ if [ -e "$BACKUP/$user.log" ] && [ "$notify" = "yes" ]; then
     subj="$user → backup has been completed"
     email=$(get_user_value '$CONTACT')
     cat $BACKUP/$user.log |$SENDMAIL -s "$subj" "$email" "$notify"
-    rm $BACKUP/$user.log
     $BIN/v-add-user-notification "$user" "Backup created successfully" "<b>Archive:</b> $user.$backup_new_date.tar"
 fi
 
+
+
 # Logging
 $BIN/v-log-action "$user" "Info" "Backup" "Backup created (Archive: $backup_new_date.tar)."
 $BIN/v-log-action "system" "Info" "Backup" "Backup created (User: $user, Archive: $backup_new_date.tar)."

func/syshealth.sh

@@ -171,18 +171,21 @@ function syshealth_restore_system_config() {
     fi
 }
 
+function check_key_exsits() {
+    grep -e "^$1=" $HESTIA/conf/hestia.conf 
+}
+
 # Repair System Configuration
 # Adds missing variables to $HESTIA/conf/hestia.conf with safe default values
 function syshealth_repair_system_config() {
     # Release branch
-    if [ -z "$RELEASE_BRANCH" ]; then
+    if  [[ -z $(check_key_exsits 'RELEASE_BRANCH') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: RELEASE_BRANCH ('release')"
         $BIN/v-change-sys-config-value 'RELEASE_BRANCH' 'release'
     fi
-
     # Webmail alias
     if [ -n "$IMAP_SYSTEM" ]; then
-        if [ -z "$WEBMAIL_ALIAS" ]; then
+        if [[ -z $(check_key_exsits 'WEBMAIL_ALIAS') ]]; then
             echo "[ ! ] Adding missing variable to hestia.conf: WEBMAIL_ALIAS ('webmail')"
             $BIN/v-change-sys-config-value 'WEBMAIL_ALIAS' 'webmail'
         fi
@@ -191,88 +194,88 @@ function syshealth_repair_system_config() {
     # phpMyAdmin/phpPgAdmin alias
     if [ -n "$DB_SYSTEM" ]; then
         if [ "$DB_SYSTEM" = "mysql" ]; then
-            if [ -z "$DB_PMA_ALIAS" ]; then 
+            if [[ -z $(check_key_exsits 'DB_PMA_ALIAS') ]]; then 
                 echo "[ ! ] Adding missing variable to hestia.conf: DB_PMA_ALIAS ('phpmyadmin)"
                 $BIN/v-change-sys-config-value 'DB_PMA_ALIAS' 'phpmyadmin'
             fi
         fi
         if [ "$DB_SYSTEM" = "pgsql" ]; then
-            if [ -z "$DB_PGA_ALIAS" ]; then 
+            if [[ -z $(check_key_exsits 'DB_PGA_ALIAS') ]]; then 
                 echo "[ ! ] Adding missing variable to hestia.conf: DB_PGA_ALIAS ('phppgadmin')"
                 $BIN/v-change-sys-config-value 'DB_PGA_ALIAS' 'phppgadmin'
             fi
         fi
     fi
 
     # Backup compression level
-    if [ -z "$BACKUP_GZIP" ]; then 
+    if [[ -z $(check_key_exsits 'BACKUP_GZIP') ]]; then 
         echo "[ ! ] Adding missing variable to hestia.conf: BACKUP_GZIP ('4')"
         $BIN/v-change-sys-config-value 'BACKUP_GZIP' '4'
     fi
 
     # Theme
-    if [ -z "$THEME" ]; then 
+    if [[ -z $(check_key_exsits 'THEME') ]]; then 
         echo "[ ! ] Adding missing variable to hestia.conf: THEME ('dark')"
         $BIN/v-change-sys-config-value 'THEME' 'dark'
     fi
 
     # Default language
-    if [ -z "$LANGUAGE" ]; then 
+    if [[ -z  $(check_key_exsits 'LANGUAGE') ]]; then 
         echo "[ ! ] Adding missing variable to hestia.conf: LANGUAGE ('en')"
-        $BIN/v-change-sys-language 'en'
+        $BIN/v-change-sys-language 'LANGUAGE' 'en'
     fi
 
     # Disk Quota
-    if [ -z "$DISK_QUOTA" ]; then 
+    if [[ -z $(check_key_exsits 'DISK_QUOTA') ]]; then 
         echo "[ ! ] Adding missing variable to hestia.conf: DISK_QUOTA ('no')"
         $BIN/v-change-sys-config-value 'DISK_QUOTA' 'no'
     fi
 
     # CRON daemon
-    if [ -z "$CRON_SYSTEM" ]; then 
+    if [[ -z $(check_key_exsits 'CRON_SYSTEM') ]]; then 
         echo "[ ! ] Adding missing variable to hestia.conf: CRON_SYSTEM ('cron')"
         $BIN/v-change-sys-config-value 'CRON_SYSTEM' 'cron'
     fi
 
     # Backend port
-    if [ -z "$BACKEND_PORT" ]; then 
+    if [[ -z $(check_key_exsits 'BACKEND_PORT') ]]; then 
         ORIGINAL_PORT=$(cat $HESTIA/nginx/conf/nginx.conf | grep "listen" | sed 's/[^0-9]*//g')
         echo "[ ! ] Adding missing variable to hestia.conf: BACKEND_PORT ('$ORIGINAL_PORT')"
         $HESTIA/bin/v-change-sys-config-value 'BACKEND_PORT' $PORT
     fi
 
     # Upgrade: Send email notification
-    if [ -z "$UPGRADE_SEND_EMAIL" ]; then 
+    if [[ -z $(check_key_exsits 'UPGRADE_SEND_EMAIL') ]]; then 
         echo "[ ! ] Adding missing variable to hestia.conf: UPGRADE_SEND_EMAIL ('true')"
         $BIN/v-change-sys-config-value 'UPGRADE_SEND_EMAIL' 'true'
     fi
 
     # Upgrade: Send email notification
-    if [ -z "$UPGRADE_SEND_EMAIL_LOG" ]; then 
+    if [[ -z $(check_key_exsits 'UPGRADE_SEND_EMAIL_LOG') ]]; then 
         echo "[ ! ] Adding missing variable to hestia.conf: UPGRADE_SEND_EMAIL_LOG ('false')"
         $BIN/v-change-sys-config-value 'UPGRADE_SEND_EMAIL_LOG' 'false'
     fi
 
     # File Manager
-    if [ -z "$FILE_MANAGER" ]; then
+    if [[ -z $(check_key_exsits 'FILE_MANAGER') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: FILE_MANAGER ('true')"
         $BIN/v-add-sys-filemanager quiet
     fi
 
     # Support for ZSTD / GZIP Change
-    if [ -z "$BACKUP_MODE" ]; then
+    if [[ -z $(check_key_exsits 'BACKUP_MODE') ]]; then
         echo "[ ! ] Setting zstd backup compression type as default..."
         $BIN/v-change-sys-config-value "BACKUP_MODE" "zstd"
     fi
 
     # Login style switcher
-    if [ -z "$LOGIN_STYLE" ]; then
+    if [[ -z $(check_key_exsits 'LOGIN_STYLE') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: LOGIN_STYLE ('default')"
         $BIN/v-change-sys-config-value "LOGIN_STYLE" "default"
     fi
 
     # Webmail clients
-    if [ -z "$WEBMAIL_SYSTEM" ]; then
+    if [[ -z $(check_key_exsits 'WEBMAIL_SYSTEM') ]]; then
         if [ -d "/var/lib/roundcube" ]; then 
             echo "[ ! ] Adding missing variable to hestia.conf: WEBMAIL_SYSTEM ('roundcube')"
             $BIN/v-change-sys-config-value "WEBMAIL_SYSTEM" "roundcube"
@@ -283,139 +286,145 @@ function syshealth_repair_system_config() {
     fi
 
     # Inactive session timeout
-    if [ -z "$INACTIVE_SESSION_TIMEOUT" ]; then
+    if [[ -z $(check_key_exsits 'INACTIVE_SESSION_TIMEOUT') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: INACTIVE_SESSION_TIMEOUT ('60')"
         $BIN/v-change-sys-config-value "INACTIVE_SESSION_TIMEOUT" "60"
     fi
 
     # Enforce subdomain ownership
-    if [ -z "$ENFORCE_SUBDOMAIN_OWNERSHIP" ]; then
+    if [[ -z $(check_key_exsits 'ENFORCE_SUBDOMAIN_OWNERSHIP') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: ENFORCE_SUBDOMAIN_OWNERSHIP ('no')"
         $BIN/v-change-sys-config-value "ENFORCE_SUBDOMAIN_OWNERSHIP" "no"
     fi
-
+    
+    if [[ -z $(check_key_exsits 'API') ]]; then 
+        echo "[ ! ] Adding missing variable to hestia.conf: API ('no')"   
+        $BIN/v-change-sys-config-value "API" "no"
+    fi
+    
     # API access allowed IP's
     if [ "$API" = "yes" ]; then
         check_api_key=$(grep "API_ALLOWED_IP" $HESTIA/conf/hestia.conf)
         if [ -z "$check_api_key" ]; then
-            if [ -z "$API_ALLOWED_IP" ]; then
+            if [[ -z $(check_key_exsits 'API_ALLOWED_IP') ]]; then
                 echo "[ ! ] Adding missing variable to hestia.conf: API_ALLOWED_IP ('allow-all')"        
                 $BIN/v-change-sys-config-value "API_ALLOWED_IP" "allow-all"
             fi
         fi
     fi
 
     # Enforce subdomain ownership
-    if [ -z "$ENFORCE_SUBDOMAIN_OWNERSHIP" ]; then
+    if [[ -z $(check_key_exsits 'ENFORCE_SUBDOMAIN_OWNERSHIP') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: ENFORCE_SUBDOMAIN_OWNERSHIP ('yes')"
         $BIN/v-change-sys-config-value "ENFORCE_SUBDOMAIN_OWNERSHIP" "yes"
     fi
     # Debug mode
-    if [ -z "$DEBUG_MODE" ]; then
+    if [[ -z $(check_key_exsits 'DEBUG_MODE') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: DEBUG_MODE ('false')"
         $BIN/v-change-sys-config-value "DEBUG_MODE" "false"
     fi
     # Quick install plugin
-    if [ -z "$PLUGIN_APP_INSTALLER" ]; then
+    if [[ -z $(check_key_exsits 'PLUGIN_APP_INSTALLER') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: PLUGIN_APP_INSTALLER ('true')"
         $BIN/v-change-sys-config-value "PLUGIN_APP_INSTALLER" "true"
     fi
     # Enable preview mode
-    if [ -z "$POLICY_SYSTEM_ENABLE_BACON" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_SYSTEM_ENABLE_BACON') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_SYSTEM_ENABLE_BACON ('false')"
         $BIN/v-change-sys-config-value "POLICY_SYSTEM_ENABLE_BACON" "false"
     fi
     # Hide system services
-    if [ -z "$POLICY_SYSTEM_HIDE_SERVICES" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_SYSTEM_HIDE_SERVICES') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_SYSTEM_HIDE_SERVICES ('no')"
         $BIN/v-change-sys-config-value "POLICY_SYSTEM_HIDE_SERVICES" "no"
     fi
     # Password reset
-    if [ -z "$POLICY_SYSTEM_PASSWORD_RESET" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_SYSTEM_PASSWORD_RESET') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_SYSTEM_PASSWORD_RESET ('no')"
         $BIN/v-change-sys-config-value "POLICY_SYSTEM_PASSWORD_RESET" "no"
     fi
-    # Protect admin user
-    if [ -z "$POLICY_SYSTEM_PROTECTED_ADMIN" ]; then
-        echo "[ ! ] Adding missing variable to hestia.conf: POLICY_SYSTEM_PROTECTED_ADMIN ('no')"
-        $BIN/v-change-sys-config-value "POLICY_SYSTEM_PROTECTED_ADMIN" "no"
-    fi
+
     # Theme editor
-    if [ -z "$POLICY_USER_CHANGE_THEME" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_USER_CHANGE_THEME') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_USER_CHANGE_THEME ('yes')"
         $BIN/v-change-sys-config-value "POLICY_USER_CHANGE_THEME" "true"
     fi    
+    # Protect admin user
+    if [[ -z $(check_key_exsits 'POLICY_SYSTEM_PROTECTED_ADMIN') ]]; then
+        echo "[ ! ] Adding missing variable to hestia.conf: POLICY_SYSTEM_PROTECTED_ADMIN ('no')"
+        $BIN/v-change-sys-config-value "POLICY_SYSTEM_PROTECTED_ADMIN" "no"
+    fi  
     # Allow user delete logs
-    if [ -z "$POLICY_USER_DELETE_LOGS" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_USER_DELETE_LOGS') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_USER_DELETE_LOGS ('yes')"
         $BIN/v-change-sys-config-value "POLICY_USER_DELETE_LOGS" "yes"
     fi
     # Allow users to delete details
-    if [ -z "$POLICY_USER_EDIT_DETAILS" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_USER_EDIT_DETAILS') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_USER_EDIT_DETAILS ('yes')"
         $BIN/v-change-sys-config-value "POLICY_USER_EDIT_DETAILS" "yes"
     fi
     # Allow users to edit DNS templates
-    if [ -z "$POLICY_USER_EDIT_DNS_TEMPLATES" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_USER_EDIT_DNS_TEMPLATES') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_USER_EDIT_DNS_TEMPLATES ('yes')"
         $BIN/v-change-sys-config-value "POLICY_USER_EDIT_DNS_TEMPLATES" "yes"
     fi
     # Allow users to edit web templates
-    if [ -z "$POLICY_USER_EDIT_WEB_TEMPLATES" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_USER_EDIT_WEB_TEMPLATES') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_USER_EDIT_WEB_TEMPLATES ('yes')"
         $BIN/v-change-sys-config-value "POLICY_USER_EDIT_WEB_TEMPLATES" "true"
     fi
     # View user logs
-    if [ -z "$POLICY_USER_VIEW_LOGS" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_USER_VIEW_LOGS') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_USER_VIEW_LOGS ('yes')"
         $BIN/v-change-sys-config-value "POLICY_USER_VIEW_LOGS" "true"
     fi
     # Allow users to login (read only) when suspended
-    if [ -z "$POLICY_USER_VIEW_SUSPENDED" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_USER_VIEW_SUSPENDED') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_USER_VIEW_SUSPENDED ('no')"
         $BIN/v-change-sys-config-value "POLICY_USER_VIEW_SUSPENDED" "no"
     fi
     # PHPMyadmin SSO key
-    if [ -z "$PHPMYADMIN_KEY" ]; then
+    if [[ -z $(check_key_exsits 'PHPMYADMIN_KEY') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: PHPMYADMIN_KEY ('')"
         $BIN/v-change-sys-config-value "PHPMYADMIN_KEY" ""
     fi
     # Use SMTP server for hestia internal mail 
-    if [ -z "$USE_SERVER_SMTP" ]; then
+    if [[ -z $(check_key_exsits 'USE_SERVER_SMTP') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: USE_SERVER_SMTP ('')"
         $BIN/v-change-sys-config-value "USE_SERVER_SMTP" "false"
     fi
 
-    if [ -z "$SERVER_SMTP_PORT" ]; then
+    if [[ -z $(check_key_exsits 'SERVER_SMTP_HOST') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: SERVER_SMTP_PORT ('')"
-        $BIN/v-change-sys-config-value "SERVER_SMTP_PORT" ""
+        $BIN/v-change-sys-config-value "SERVER_SMTP_HOST" ""
     fi
 
-    if [ -z "$SERVER_SMTP_HOST" ]; then
+    if [[ -z $(check_key_exsits 'SERVER_SMTP_HOST') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: SERVER_SMTP_HOST ('')"
         $BIN/v-change-sys-config-value "SERVER_SMTP_HOST" ""
     fi
 
-    if [ -z "$SERVER_SMTP_SECURITY" ]; then
+    if [[ -z $(check_key_exsits 'SERVER_SMTP_SECURITY') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: SERVER_SMTP_SECURITY ('')"
         $BIN/v-change-sys-config-value "SERVER_SMTP_SECURITY" ""
     fi
 
-    if [ -z "$SERVER_SMTP_USER" ]; then
+    if [[ -z $(check_key_exsits 'SERVER_SMTP_USER') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: SERVER_SMTP_USER ('')"
         $BIN/v-change-sys-config-value "SERVER_SMTP_USER" ""
     fi
 
-    if [ -z "$SERVER_SMTP_PASSWD" ]; then
+    if [[ -z $(check_key_exsits 'SERVER_SMTP_PASSWD') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: SERVER_SMTP_PASSWD ('')"
         $BIN/v-change-sys-config-value "SERVER_SMTP_PASSWD" ""
     fi
 
-    if [ -z "$SERVER_SMTP_ADDR" ]; then
+    if [[ -z $(check_key_exsits 'SERVER_SMTP_ADDR') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: SERVER_SMTP_ADDR ('')"
         $BIN/v-change-sys-config-value "SERVER_SMTP_ADDR" ""
     fi    
-    if [ -z "$POLICY_CSRF_STRICTNESS" ]; then
+    if [[ -z $(check_key_exsits 'POLICY_CSRF_STRICTNESS') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: POLICY_CSRF_STRICTNESS ('')"
         $BIN/v-change-sys-config-value "POLICY_CSRF_STRICTNESS" "1"
     fi