install/php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod_php_install.sh: fix error set Pool Definitions.

Browse Source
This commit is contained in:
Christoph 2021-09-13 23:23:40 +02:00
parent 509e05bd43
commit 7c9f54a8a0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mod_php_install.sh
View File

@ -1292,7 +1292,7 @@ if [ -d "$PREFIX_PHP" ];then
fi fi
declare -a existing_fpm_definition_arr=() declare -a existing_fpm_definition_arr=()
FPM_DEFAULT_POOL_DEFINITION_EXISTS=false #FPM_DEFAULT_POOL_DEFINITION_EXISTS=false
if $WITH_PHP_FPM_SUPPORT ; then if $WITH_PHP_FPM_SUPPORT ; then
echo "" echo ""
@ -1303,7 +1303,8 @@ if $WITH_PHP_FPM_SUPPORT ; then
for _file in $(ls $PREFIX_PHP.${_backup_date}/etc/fpm.d/*.conf) ; do for _file in $(ls $PREFIX_PHP.${_backup_date}/etc/fpm.d/*.conf) ; do
if [[ "$(basename "$_file")" = "${FPM_DEFAULT_POOL}.php-fpm.conf" ]]; then if [[ "$(basename "$_file")" = "${FPM_DEFAULT_POOL}.php-fpm.conf" ]]; then
FPM_DEFAULT_POOL_DEFINITION_EXISTS=true continue
#FPM_DEFAULT_POOL_DEFINITION_EXISTS=true
fi fi
existing_fpm_definition_arr+=("$(realpath "$_file")") existing_fpm_definition_arr+=("$(realpath "$_file")")
done 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 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 if [[ "$(basename "$_file")" = "${FPM_DEFAULT_POOL}.php-fpm.conf" ]]; then
FPM_DEFAULT_POOL_DEFINITION_EXISTS=true continue
#FPM_DEFAULT_POOL_DEFINITION_EXISTS=true
fi fi
existing_fpm_definition_arr+=("$(realpath "$_file")") existing_fpm_definition_arr+=("$(realpath "$_file")")
done done
@ -2883,9 +2885,9 @@ EOF
fi fi
echononl "\tCreate php-fpm configuration file for pool \"${FPM_DEFAULT_POOL}\"" echononl "\tCreate php-fpm configuration file for pool \"${FPM_DEFAULT_POOL}\""
if $FPM_DEFAULT_POOL_DEFINITION_EXISTS ; then #if $FPM_DEFAULT_POOL_DEFINITION_EXISTS ; then
echo_skipped # echo_skipped
else #else
cat <<EOF > ${PREFIX_PHP}/etc/${FPM_POOL_CONF_DIR}/${FPM_DEFAULT_POOL}.php-fpm.conf cat <<EOF > ${PREFIX_PHP}/etc/${FPM_POOL_CONF_DIR}/${FPM_DEFAULT_POOL}.php-fpm.conf
;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;
; Pool Definitions ; ; Pool Definitions ;
@ -3349,7 +3351,7 @@ EOF
else else
echo_failed echo_failed
fi fi
fi #fi
# - Copy PHP FPM definitions from current installation to the new one. # - Copy PHP FPM definitions from current installation to the new one.
# - # -