github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

purely dynamic path for php-fpm

Browse source
This commit is contained in:
Serghey Rodin 2016-11-23 11:20:34 +02:00
commit 9aae395aa2
2 changed files with 4 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bin/v-delete-web-domain-backend
View file

@ -38,20 +38,9 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
#----------------------------------------------------------# #----------------------------------------------------------#
# Defining pool directory # Defining pool directory
if [ -d "/etc/php-fpm.d" ]; then pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
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
if [ ! -e "$pool" ]; then if [ ! -e "$pool" ]; then
pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \)) check_result $E_NOTEXIST "php-fpm pool doesn't exist"
if [ ! -e "$pool" ]; then
check_result $E_NOTEXIST "php-fpm pool doesn't exist"
fi
fi fi
# Defining backend type # Defining backend type

15
func/domain.sh
View file

@ -84,20 +84,9 @@ is_web_alias_new() {
# Prepare web backend # Prepare web backend
prepare_web_backend() { prepare_web_backend() {
if [ -d "/etc/php-fpm.d" ]; then pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
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
if [ ! -e "$pool" ]; then if [ ! -e "$pool" ]; then
pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \)) check_result $E_NOTEXIST "php-fpm pool doesn't exist"
if [ ! -e "$pool" ]; then
check_result $E_NOTEXIST "php-fpm pool doesn't exist"
fi
fi fi
backend_type="$domain" backend_type="$domain"