Merge pull request hestiacp#275 from Lupul/bugfix-0501-1

Bugfix overwrite correct templates when using multiphp

Author: ScIT-Raphael

bin/v-rebuild-web-domains

@@ -37,7 +37,9 @@ is_object_unsuspended 'user' 'USER' "$user"
 #----------------------------------------------------------#
 
 # Deleting old web configs
-sed -i "/.*\/$user\/conf\/web\//d" /etc/$WEB_SYSTEM/conf.d/hestia.conf
+if [ -e "/etc/$WEB_SYSTEM/conf.d/hestia.conf" ]; then
+    sed -i "/.*\/$user\/conf\/web\//d" /etc/$WEB_SYSTEM/conf.d/hestia.conf
+fi
 
 if [ -e "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf" ]; then
     rm -f $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf
@@ -50,7 +52,9 @@ fi
 
 # Deleting old proxy configs
 if [ ! -z "$PROXY_SYSTEM" ]; then
-    sed -i "/.*\/$user\/conf\/web\//d" /etc/$PROXY_SYSTEM/conf.d/hestia.conf
+    if [ -e "/etc/$PROXY_SYSTEM/conf.d/hestia.conf" ]; then
+        sed -i "/.*\/$user\/conf\/web\//d" /etc/$PROXY_SYSTEM/conf.d/hestia.conf
+    fi
 
     if [ -e "$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf" ]; then
         rm -f $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf

bin/v-update-web-templates

@@ -40,6 +40,21 @@ fi
 # Update templates
 cp -rf $HESTIA/install/$type/templates/web $HESTIA/data/templates/
 
+# Update Multiphp templates
+php_versions=$( ls -l /etc/php/ | grep ^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
+        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
 for user in $($BIN/v-list-sys-users plain); do
     $BIN/v-rebuild-web-domains $user no

func/domain.sh

@@ -307,10 +307,12 @@ del_web_config() {
     fi
 
     # Remove domain configuration files and clean up symbolic links
-    rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.conf 
-    rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.conf 
-    rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.ssl.conf 
-    rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.ssl.conf 
+    rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.conf
+    rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.ssl.conf
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.conf 
+        rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.ssl.conf 
+    fi
 
     # Clean up legacy configuration files
     if [ -e "$conf" ]; then

install/upgrade/0.10.0-190430.sh

@@ -171,7 +171,7 @@ fi
 php_versions=$( ls -l /etc/php/ | grep ^d | wc -l )
 if [ "$php_versions" -gt 1 ]; then
     for v in $(ls /etc/php/); do
-        cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$d/fpm/pool.d/
+        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