Update webmail rebuild routine

Author: Kristan Kenney

bin/v-add-webmail

@@ -78,12 +78,14 @@ fi
 #                       Hestia                             #
 #----------------------------------------------------------#
 
-# Restarting web server
-$BIN/v-restart-web $restart
-check_result $? "Web restart failed" >/dev/null
+if [ ! -z "$3" ]; then 
+    # Restarting web server
+    $BIN/v-restart-web $restart
+    check_result $? "Web restart failed" >/dev/null
 
-$BIN/v-restart-proxy $restart
-check_result $? "Proxy restart failed" >/dev/null
+    $BIN/v-restart-proxy $restart
+    check_result $? "Proxy restart failed" >/dev/null
+fi
 
 # Logging
 log_history "enabled webmail support for $domain"

bin/v-delete-webmail

@@ -46,12 +46,14 @@ del_webmail_config
 #                       Hestia                              #
 #----------------------------------------------------------#
 
-# Restarting web server
-$BIN/v-restart-web $restart
-check_result $? "Web restart failed" >/dev/null
-
-$BIN/v-restart-proxy $restart
-check_result $? "Proxy restart failed" >/dev/null
+if [ ! -z "$3" ]; then
+    # Restarting web server
+    $BIN/v-restart-web $restart
+    check_result $? "Web restart failed" >/dev/null
+
+    $BIN/v-restart-proxy $restart
+    check_result $? "Proxy restart failed" >/dev/null
+fi
 
 # Logging
 log_history "disabled webmail support for $domain"

bin/v-rebuild-mail-domains

@@ -54,8 +54,8 @@ fi
 for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
     rebuild_mail_domain_conf
     if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
-        $BIN/v-delete-webmail $1 $domain 'no'
-        $BIN/v-add-webmail $1 $domain 'yes'
+        $BIN/v-delete-webmail $1 $domain ''
+        $BIN/v-add-webmail $1 $domain '' 
         sleep 0.5
     fi
 done

install/upgrade/0.9.8-29.sh

@@ -220,10 +220,10 @@ $HESTIA/bin/v-add-sys-sftp-jail
 # Rebuild user
 for user in `ls /usr/local/hestia/data/users/`; do
     echo "(*) Rebuilding domains and account for user: $user..."
-    v-rebuild-web-domains $user
-    sleep 0.5
-    v-rebuild-dns-domains $user
-    sleep 0.5
-    v-rebuild-mail-domains $user
-    sleep 0.5
+    v-rebuild-web-domains $user >/dev/null 2>&1
+    sleep 1
+    v-rebuild-dns-domains $user >/dev/null 2>&1
+    sleep 1
+    v-rebuild-mail-domains $user >/dev/null 2>&1
+    sleep 1
 done