Merge branch 'fix/restart-proxy-issue' into main

Author: jaapmarcus

bin/v-change-sys-hostname

@@ -63,7 +63,7 @@ else
 fi
 
 # Update ip helo for exim
-if [[] ! -z "$MAIL_SYSTEM" && "$helo" == "yes" ]]; then
+if [[ ! -z "$MAIL_SYSTEM" && "$helo" == "yes" ]]; then
     pub_ip=$(curl --ipv4 -s https://ip.hestiacp.com/)
     $BIN/v-change-sys-ip-helo $pub_ip $domain
 fi

bin/v-restart-proxy

@@ -72,7 +72,7 @@ if [ -f "$HESTIA/web/inc/nginx_proxy" ]; then
     # Default behaviour
 
     # Preform an check if Nginx is valid as reload doesn't throw an error / exit
-    result=$(service $WEB_SYSTEM $PROXY_SYSTEM  >> /dev/null 2>&1 )
+    service $PROXY_SYSTEM configtest  >> /dev/null 2>&1
     if [ $? -ne 0 ]; then
         send_email_report
         check_result $E_RESTART "$PROXY_SYSTEM restart failed"

bin/v-restart-web

@@ -55,13 +55,13 @@ if [ -z "$WEB_SYSTEM" ] || [ "$WEB_SYSTEM" = 'remote' ]; then
     exit
 fi
 if [ $WEB_SYSTEM = 'nginx' ]; then 
-    result=$(service $WEB_SYSTEM configtest  >> /dev/null 2>&1 )
+    service $WEB_SYSTEM configtest  >> /dev/null 2>&1
     if [ $? -ne 0 ]; then
         send_email_report
         check_result $E_RESTART "$WEB_SYSTEM restart failed"
     fi
 elif [ $WEB_SYSTEM = 'apache2' ]; then 
-    result=$(apache2ctl configtest  >> /dev/null 2>&1 )
+    apache2ctl configtest  >> /dev/null 2>&1
     if [ $? -ne 0 ]; then
         send_email_report
         check_result $E_RESTART "$WEB_SYSTEM restart failed"