From d9c91b9b051bd0c36bc7de4c2d4a3c62f51d8aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro=20Andr=C3=A9s?= <jpandres@hiberus.com>
Date: Thu, 27 Dec 2018 14:54:55 +0100
Subject: [PATCH] Allow to use multiple php-fpm pools

---
 bin/v-change-web-domain-backend-tpl |  2 +-
 bin/v-delete-web-domain-backend     |  2 +-
 bin/v-rebuild-web-domains           |  4 ++--
 func/domain.sh                      | 27 ++++++++++++++++++++++++++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl
index 62918d094..f75d037f5 100755
--- a/bin/v-change-web-domain-backend-tpl
+++ b/bin/v-change-web-domain-backend-tpl
@@ -48,7 +48,7 @@ is_backend_template_valid $template
 prepare_web_backend
 
 # Deleting backend
-rm -f $pool/$backend_type.conf
+delete_web_backend
 
 # Allocating backend port
 backend_port=9000
diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend
index 935b55bbc..7ee0a881c 100755
--- a/bin/v-delete-web-domain-backend
+++ b/bin/v-delete-web-domain-backend
@@ -63,7 +63,7 @@ if [ "$WEB_BACKEND_POOL" = 'user' ]; then
 fi
 
 # Deleting backend
-rm -f $pool/$backend_type.conf
+delete_web_backend
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains
index 2094d19c1..9e55872ef 100755
--- a/bin/v-rebuild-web-domains
+++ b/bin/v-rebuild-web-domains
@@ -62,11 +62,11 @@ fi
 if [ ! -z "$WEB_BACKEND" ]; then
     if [ "$WEB_BACKEND_POOL" = 'user' ]; then
         prepare_web_backend
-        rm -f $pool/$backend_type.conf
+        delete_web_backend
     else
         for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
             prepare_web_backend
-            rm -f $pool/$backend_type.conf
+            delete_web_backend
         done
     fi
 fi
diff --git a/func/domain.sh b/func/domain.sh
index cc66aecbc..4cb825e8b 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -84,7 +84,27 @@ is_web_alias_new() {
 
 # Prepare web backend
 prepare_web_backend() {
-    pool=$(find -L /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
+    pool=$(find -L /etc/php/ -name "$domain.conf" -exec dirname {} \;)
+
+    #
+    # Check if multiple-PHP installed
+    #
+    regex="socket-(\d+)_(\d+)"
+    if [[ $template =~ ^socket-([0-9])\_([0-9])$ ]]
+    then
+        version="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
+        pool=$(find -L /etc/php/$version -type d \( -name "pool.d" -o -name "*fpm.d" \))
+    else
+        if [ "$pool" == "" ]
+        then
+            version=`echo "<?php echo (float)phpversion();" | php`
+            pool=$(find -L /etc/php/$version -type d \( -name "pool.d" -o -name "*fpm.d" \))
+        fi
+    fi
+    #
+    # /Check if multiple-PHP installed
+    #
+
     if [ ! -e "$pool" ]; then
         check_result $E_NOTEXIST "php-fpm pool doesn't exist"
     fi
@@ -102,6 +122,11 @@ prepare_web_backend() {
     fi
 }
 
+# Delete web backend
+delete_web_backend() {
+    find -L /etc/php/ -type f -name "$backend_type.conf" -exec rm -f {} \;
+}
+
 # Prepare web aliases
 prepare_web_aliases() {
     i=1