Improve php version detection from backend template

web-tpl name was wrongly used instead of backed-tpl in some cases

Author: Lupul

bin/v-rebuild-web-domain

@@ -70,9 +70,9 @@ fi
 
 # Deleting backend configs
 if [ ! -z "$WEB_BACKEND" ]; then
+    template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND')
     prepare_web_backend
     delete_web_backend
-    template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND')
     $BIN/v-add-web-domain-backend $user $domain $template $restart
 fi
 

bin/v-rebuild-web-domains

@@ -85,6 +85,7 @@ if [ ! -z "$WEB_BACKEND" ]; then
         delete_web_backend
     else
         for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
+            template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND')
             prepare_web_backend
             delete_web_backend
         done

bin/v-unsuspend-web-domain

@@ -71,7 +71,7 @@ fi
 
 # Rebuilding backend configuration
 if [ ! -z "$WEB_BACKEND" ]; then
-    prepare_web_backend
+    prepare_web_backend "$BACKEND"
     delete_web_backend
     template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND')
     $BIN/v-add-web-domain-backend $user $domain $template $restart

func/domain.sh

@@ -84,10 +84,13 @@ is_web_alias_new() {
 
 # Prepare web backend
 prepare_web_backend() {
+    # Accept first function argument as backend template otherwise fallback to $template global variable
+    local backend_template=${1:-$template}
+
     pool=$(find -L /etc/php/ -name "$domain.conf" -exec dirname {} \;)
     # Check if multiple-PHP installed
     regex="socket-(\d+)_(\d+)"
-    if [[ $template =~ ^PHP-([0-9])\_([0-9])$ ]]; then
+    if [[ $backend_template =~ ^PHP-([0-9])\_([0-9])$ ]]; then
         backend_version="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
         pool=$(find -L /etc/php/$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))
     else
@@ -160,7 +163,7 @@ prepare_web_domain_values() {
     fi
 
     if [ ! -z "$WEB_BACKEND" ]; then
-        prepare_web_backend
+        prepare_web_backend "$BACKEND"
     fi
 
     server_alias=''