Jelajahi Sumber

purely dynamic path for php-fpm

Serghey Rodin 9 tahun lalu
induk
melakukan
9aae395aa2
2 mengubah file dengan 4 tambahan dan 26 penghapusan
  1. 2 13
      bin/v-delete-web-domain-backend
  2. 2 13
      func/domain.sh

+ 2 - 13
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

+ 2 - 13
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"