PHP pool.d osal (WIP)

bin/v-change-web-domain-backend-tpl

@@ -17,6 +17,7 @@ template=$3
 restart=$4
 
 # Includes
+source $HESTIA/func/osal.sh
 source $HESTIA/func/main.sh
 source $HESTIA/func/domain.sh
 source $HESTIA/func/ip.sh

bin/v-delete-web-domain-backend

@@ -15,6 +15,7 @@ domain=$2
 domain_idn=$2
 
 # Includes
+source $HESTIA/func/osal.sh
 source $HESTIA/func/main.sh
 source $HESTIA/func/domain.sh
 source $HESTIA/conf/hestia.conf
@@ -46,7 +47,7 @@ check_hestia_demo_mode
 #----------------------------------------------------------#
 
 # Defining pool directory
-pool=$(find -L /etc/php/ -name "$domain.conf" -exec dirname {} \;)
+pool=$(find -L $PHP_DIR_POOL_D_BASE -name "$domain.conf" -exec dirname {} \;)
 if [ ! -e "$pool" ]; then
     check_result $E_NOTEXIST "php-fpm pool doesn't exist"
 fi

bin/v-rebuild-web-domain

@@ -15,6 +15,7 @@ domain=$2
 restart=$3
 
 # Includes
+source $HESTIA/func/osal.sh
 source $HESTIA/func/main.sh
 source $HESTIA/func/domain.sh
 source $HESTIA/func/ip.sh

bin/v-rebuild-web-domains

@@ -14,6 +14,7 @@ user=$1
 restart=$2
 
 # Includes
+source $HESTIA/func/osal.sh
 source $HESTIA/func/main.sh
 source $HESTIA/func/domain.sh
 source $HESTIA/func/ip.sh
@@ -68,13 +69,14 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
 fi
 
 # Create dummy php-fpm configs if missing
-for php_folder in /etc/php/*; do
-    [ ! -d "${php_folder}/fpm/pool.d/" ] && continue
+for php_folder in $PHP_DIR_POOL_D_BASE/*; do
+    pool_d=$(osal_multiphp_fpm_pool_d ${php_folder})
+    [ ! -d "$pool_d" ] && continue
 
     v_php="$(basename $php_folder)"
-    if [ ! -f "/etc/php/${v_php}/fpm/pool.d/dummy.conf" ]; then
-        cp -f "$HESTIA_INSTALL_DIR/php-fpm/dummy.conf" "/etc/php/${v_php}/fpm/pool.d/"
-        sed -i "s/9999/99${v_php//.}/g" "/etc/php/${v_php}/fpm/pool.d/dummy.conf"
+    if [ ! -f "$pool_d/dummy.conf" ]; then
+        cp -f "$HESTIA_INSTALL_DIR/php-fpm/dummy.conf" "$pool_d/"
+        sed -i "s/9999/99${v_php//.}/g" "$pool_d/dummy.conf"
     fi
 done
 

bin/v-restart-web-backend

@@ -44,15 +44,16 @@ if [ -z "$WEB_BACKEND" ] || [ "$WEB_BACKEND" = 'remote' ]; then
 fi
 
 tmpfile=$(mktemp)
-for php_folder in /etc/php/*; do
-    [ ! -d "${php_folder}/fpm/pool.d/" ] && continue
+for php_folder in $PHP_DIR_POOL_D_BASE/*; do
+    pool_d=$(osal_multiphp_fpm_pool_d ${php_folder})
+    [ ! -d "$pool_d" ] && continue
 
     v_php="$(basename $php_folder)"
     v_phpfpm="php${v_php}-fpm"
 
-    if [ ! -f "/etc/php/${v_php}/fpm/pool.d/dummy.conf" ]; then
-        cp -f "$HESTIA_INSTALL_DIR/php-fpm/dummy.conf" "/etc/php/${v_php}/fpm/pool.d/"
-        sed -i "s/9999/99${v_php//.}/g" "/etc/php/${v_php}/fpm/pool.d/dummy.conf"
+    if [ ! -f "$pool_d/dummy.conf" ]; then
+        cp -f "$HESTIA_INSTALL_DIR/php-fpm/dummy.conf" "$pool_d/"
+        sed -i "s/9999/99${v_php//.}/g" "$pool_d/dummy.conf"
     fi
 
     $BIN/v-restart-service "$v_phpfpm" >> $tmpfile 2>&1

bin/v-unsuspend-web-domain

@@ -16,6 +16,7 @@ domain_idn=$2
 restart=$3
 
 # Includes
+source $HESTIA/func/osal.sh
 source $HESTIA/func/main.sh
 source $HESTIA/func/domain.sh
 source $HESTIA/func/ip.sh

func/domain.sh

@@ -87,21 +87,26 @@ 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 {} \;)
+    pool=$(find -L $PHP_DIR_POOL_D_BASE/ -name "$domain.conf" -exec dirname {} \;)
     # Check if multiple-PHP installed
     regex="socket-(\d+)_(\d+)"
     if [[ $backend_template =~ ^.*PHP-([0-9])\_([0-9])$ ]]; then
+    echo 1
         backend_version="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
-        pool=$(find -L /etc/php/$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))
+        #pool=$(find -L /etc/php/$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))
+        pool=$(osal_multiphp_fpm_pool_d $backend_version)
     else
+    echo 2
         backend_version=$(multiphp_default_version)
-        if [ -z "$pool" ] || [ -z "$BACKEND" ]; then 
-            pool=$(find -L /etc/php/$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))
+        if [ -z "$pool" ] || [ -z "$BACKEND" ]; then
+            #pool=$(find -L /etc/php/$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))
+            pool=$(osal_multiphp_fpm_pool_d $backend_version)
+            echo 3
         fi
     fi
  
     if [ ! -e "$pool" ]; then
-        check_result $E_NOTEXIST "php-fpm pool doesn't exist"
+        check_result $E_NOTEXIST "php-fpm pool doesn't exist ($pool / $backend_template)"
     fi
     backend_type="$domain"
     if [ "$WEB_BACKEND_POOL" = 'user' ]; then