From 9aae395aa2f94891cf20609ceaa822fa1fa706ca Mon Sep 17 00:00:00 2001
From: Serghey Rodin <skid@vestacp.com>
Date: Wed, 23 Nov 2016 11:20:34 +0200
Subject: [PATCH] purely dynamic path for php-fpm

---
 bin/v-delete-web-domain-backend | 15 ++-------------
 func/domain.sh                  | 15 ++-------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend
index 6b0114d3e..4b9b24ba6 100755
--- a/bin/v-delete-web-domain-backend
+++ b/bin/v-delete-web-domain-backend
@@ -38,20 +38,9 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
 #----------------------------------------------------------#
 
 # Defining pool directory
-if [ -d "/etc/php-fpm.d" ]; then
-    pool="/etc/php-fpm.d"
-fi
-if [ -d "/etc/php5/fpm/pool.d" ]; then
-    pool="/etc/php5/fpm/pool.d"
-fi
-if [ -d "/etc/php/7.0/fpm/pool.d" ]; then
-    pool="/etc/php/7.0/fpm/pool.d"
-fi
+pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
 if [ ! -e "$pool" ]; then
-    pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
-    if [ ! -e "$pool" ]; then
-        check_result $E_NOTEXIST "php-fpm pool doesn't exist"
-    fi
+    check_result $E_NOTEXIST "php-fpm pool doesn't exist"
 fi
 
 # Defining backend type
diff --git a/func/domain.sh b/func/domain.sh
index e21a55754..3ee84c8ce 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -84,20 +84,9 @@ is_web_alias_new() {
 
 # Prepare web backend
 prepare_web_backend() {
-    if [ -d "/etc/php-fpm.d" ]; then
-        pool="/etc/php-fpm.d"
-    fi
-    if [ -d "/etc/php5/fpm/pool.d" ]; then
-        pool="/etc/php5/fpm/pool.d"
-    fi
-    if [ -d "/etc/php/7.0/fpm/pool.d" ]; then
-        pool="/etc/php/7.0/fpm/pool.d"
-    fi
+    pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
     if [ ! -e "$pool" ]; then
-        pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
-        if [ ! -e "$pool" ]; then
-            check_result $E_NOTEXIST "php-fpm pool doesn't exist"
-        fi
+        check_result $E_NOTEXIST "php-fpm pool doesn't exist"
     fi
 
     backend_type="$domain"