github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 05:14:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

web function refactoring

Browse source
This commit is contained in:
Serghey Rodin 2016-06-09 17:09:25 +03:00
commit 8b237eb936
2 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/v-delete-user-backup-exclusions
View file

@ -23,7 +23,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------# #----------------------------------------------------------#
check_args '1' "$#" 'USER [SYSTEM]' check_args '1' "$#" 'USER [SYSTEM]'
validate_format 'user' is_format_valid 'user'
is_object_valid 'user' 'USER' "$user" is_object_valid 'user' 'USER' "$user"
@ -72,6 +72,6 @@ if [ -z "$system" ]; then
else else
log_history "deleted $system exlusion" log_history "deleted $system exlusion"
fi fi
log_event "$OK" "$EVENT" log_event "$OK" "$ARGUMENTS"
exit exit

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

@ -25,27 +25,48 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------# #----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN' check_args '2' "$#" 'USER DOMAIN'
validate_format 'user' 'domain' is_format_valid 'user' 'domain'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_object_valid 'user' 'USER' "$user" is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain" is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain" is_object_unsuspended 'web' 'DOMAIN' "$domain"
is_web_backend_pool_valid
# Checking last webdomain
domains=$(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'|wc -l)
if [ "$backend" = "$user" ] && [ "$domains" -gt 1 ]; then
exit
fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# 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 [ ! -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
fi
# Defining backend type
backend_type="$domain"
if [ "$WEB_BACKEND_POOL" = 'user' ]; then
backend_type="$user"
fi
# Checking last webdomain
if [ "$WEB_BACKEND_POOL" = 'user' ]; then
domains=$(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'|wc -l)
if [ "$backend" = "$user" ] && [ "$domains" -gt 1 ]; then
exit
fi
fi
# Deleting backend # Deleting backend
rm -f $pool/$backend.conf rm -f $pool/$backend_type.conf
#----------------------------------------------------------# #----------------------------------------------------------#
@ -60,6 +81,6 @@ fi
# Logging # Logging
log_history "deleting backend support for $domain" log_history "deleting backend support for $domain"
log_event "$OK" "$EVENT" log_event "$OK" "$ARGUMENTS"
exit exit