Merge remote-tracking branch 'Lupul/bugfix-0510' into develop

Author: Kristan Kenney

bin/v-rebuild-mail-domains

@@ -45,9 +45,6 @@ U_MAIL_SSL=0
 SUSPENDED_MAIL=0
 U_DISK_MAIL=0
 
-# Update mail templates
-$BIN/v-update-mail-templates
-
 # Checking mail folder
 if [ ! -d "$USER_DATA/mail" ]; then
     rm -f $USER_DATA/mail

bin/v-update-mail-templates

@@ -40,6 +40,11 @@ fi
 # Update templates
 cp -rf $HESTIA/install/$type/templates/mail $HESTIA/data/templates/
 
+# Rebuilding mail domains
+for user in $($BIN/v-list-sys-users plain); do
+    $BIN/v-rebuild-mail-domains $user no
+done
+
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#

bin/v-update-web-templates

@@ -41,23 +41,21 @@ fi
 cp -rf $HESTIA/install/$type/templates/web $HESTIA/data/templates/
 
 # Update Multi-PHP templates
-if [ -d "/etc/php/*/fpm" ]; then
-    php_versions=$(ls /etc/php/*/fpm -d | wc -l)
-    if [ "$php_versions" -gt 1 ]; then
-        if [ "$WEB_SYSTEM" = "nginx" ]; then
-            for tplname in $(ls $HESTIA/data/templates/web/$WEB_SYSTEM/ | grep -v 'default'); do
-                rm -fr $HESTIA/data/templates/web/$WEB_SYSTEM/$tplname
-            done
-        fi
-        for v in $(ls /etc/php/); do
-            if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
-                continue
-            fi
-            v_tpl=$(echo "$v" | sed -e 's/[.]//')
-            cp -f $HESTIA/install/$type/multiphp/$WEB_SYSTEM/PHP-$v_tpl.* $HESTIA/data/templates/web/$WEB_SYSTEM/
+php_versions=$(ls /etc/php/*/fpm -d 2>/dev/null | wc -l)
+if [ "$php_versions" -gt 1 ]; then
+    if [ "$WEB_SYSTEM" = "nginx" ]; then
+        for tplname in $(ls $HESTIA/data/templates/web/$WEB_SYSTEM/ | grep -v 'default'); do
+            rm -fr $HESTIA/data/templates/web/$WEB_SYSTEM/$tplname
         done
-        chmod a+x $HESTIA/data/templates/web/$WEB_SYSTEM/*.sh
     fi
+    for v in $(ls /etc/php/); do
+        if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
+            continue
+        fi
+        v_tpl=$(echo "$v" | sed -e 's/[.]//')
+        cp -f $HESTIA/install/$type/multiphp/$WEB_SYSTEM/PHP-$v_tpl.* $HESTIA/data/templates/web/$WEB_SYSTEM/
+    done
+    chmod a+x $HESTIA/data/templates/web/$WEB_SYSTEM/*.sh
 fi
 
 # Rebuilding web domains

install/upgrade/0.10.0-190430.sh

@@ -191,19 +191,17 @@ if [ "$PROXY_SYSTEM" = "nginx" ]; then
 fi
 
 # Fix empty pool error message for MultiPHP
-if [ -d "/etc/php/*/fpm" ]; then
-    php_versions=$(ls /etc/php/*/fpm -d | wc -l)
-    if [ "$php_versions" -gt 1 ]; then
-        for v in $(ls /etc/php/); do
-            if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
-                continue
-            fi
-            echo "(*) Updating Multi-PHP configuration..."
-            cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$v/fpm/pool.d/
-            v1=$(echo "$v" | sed -e 's/[.]//')
-            sed -i "s/9999/99$v1/g" /etc/php/$v/fpm/pool.d/dummy.conf
-        done
-    fi
+php_versions=$(ls /etc/php/*/fpm -d 2>/dev/null |wc -l)
+if [ "$php_versions" -gt 1 ]; then
+    for v in $(ls /etc/php/); do
+        if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
+            continue
+        fi
+        echo "(*) Updating Multi-PHP configuration..."
+        cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$v/fpm/pool.d/
+        v1=$(echo "$v" | sed -e 's/[.]//')
+        sed -i "s/9999/99$v1/g" /etc/php/$v/fpm/pool.d/dummy.conf
+    done
 fi
 
 # Set Purge to false in Roundcube configuration - https://goo.gl/3Nja3u