From 7c9f54a8a0fe649c177dbb6151157a6d28d896d3 Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 13 Sep 2021 23:23:40 +0200 Subject: [PATCH] mod_php_install.sh: fix error set Pool Definitions. --- mod_php_install.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mod_php_install.sh b/mod_php_install.sh index b769ce4..cf0a0eb 100755 --- a/mod_php_install.sh +++ b/mod_php_install.sh @@ -1292,7 +1292,7 @@ if [ -d "$PREFIX_PHP" ];then fi declare -a existing_fpm_definition_arr=() -FPM_DEFAULT_POOL_DEFINITION_EXISTS=false +#FPM_DEFAULT_POOL_DEFINITION_EXISTS=false if $WITH_PHP_FPM_SUPPORT ; then echo "" @@ -1303,7 +1303,8 @@ if $WITH_PHP_FPM_SUPPORT ; then for _file in $(ls $PREFIX_PHP.${_backup_date}/etc/fpm.d/*.conf) ; do if [[ "$(basename "$_file")" = "${FPM_DEFAULT_POOL}.php-fpm.conf" ]]; then - FPM_DEFAULT_POOL_DEFINITION_EXISTS=true + continue + #FPM_DEFAULT_POOL_DEFINITION_EXISTS=true fi existing_fpm_definition_arr+=("$(realpath "$_file")") done @@ -1314,7 +1315,8 @@ if $WITH_PHP_FPM_SUPPORT ; then for _file in $(ls /usr/local/php-${PHP_MAIN_VERSION}/etc/fpm.d/*.conf) ; do if [[ "$(basename "$_file")" = "${FPM_DEFAULT_POOL}.php-fpm.conf" ]]; then - FPM_DEFAULT_POOL_DEFINITION_EXISTS=true + continue + #FPM_DEFAULT_POOL_DEFINITION_EXISTS=true fi existing_fpm_definition_arr+=("$(realpath "$_file")") done @@ -2883,9 +2885,9 @@ EOF fi echononl "\tCreate php-fpm configuration file for pool \"${FPM_DEFAULT_POOL}\"" - if $FPM_DEFAULT_POOL_DEFINITION_EXISTS ; then - echo_skipped - else + #if $FPM_DEFAULT_POOL_DEFINITION_EXISTS ; then + # echo_skipped + #else cat < ${PREFIX_PHP}/etc/${FPM_POOL_CONF_DIR}/${FPM_DEFAULT_POOL}.php-fpm.conf ;;;;;;;;;;;;;;;;;;;; ; Pool Definitions ; @@ -3349,7 +3351,7 @@ EOF else echo_failed fi - fi + #fi # - Copy PHP FPM definitions from current installation to the new one. # -