diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl index 71dc9fd63..ab5d1451c 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/bin/v-restart-web-backend b/bin/v-restart-web-backend index e1d8ebe94..fd80ac6db 100755 --- a/bin/v-restart-web-backend +++ b/bin/v-restart-web-backend @@ -50,12 +50,15 @@ if [ -z "$WEB_BACKEND" ] || [ "$WEB_BACKEND" = 'remote' ]; then fi # Restart system -php_fpm=$(ls /etc/init.d/php*-fpm* 2>/dev/null |cut -f 4 -d / |head -n 1) -if [ -z "$php_fpm" ]; then - service $WEB_BACKEND restart >/dev/null 2>&1 -else - service $php_fpm restart >/dev/null 2>&1 -fi +php_fpm=$(ls /etc/init.d/php*-fpm* 2>/dev/null |cut -f 4 -d /) +for back in $php_fpm +do + if [ -z "$php_fpm" ]; then + service $WEB_BACKEND restart >/dev/null 2>&1 + else + service $back restart >/dev/null 2>&1 + fi +done if [ $? -ne 0 ]; then send_email_report diff --git a/func/domain.sh b/func/domain.sh index 6bd05b910..ab21356fa 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 "