github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 02:28:05 -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:05:41 +03:00
commit 872cd3ac45
20 changed files with 744 additions and 1239 deletions
Download patch file Download diff file Expand all files Collapse all files

30
bin/v-delete-web-domain-ssl
View file

@ -26,7 +26,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -41,17 +41,13 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL'
# Parsing domain values
get_domain_values 'web'
conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl"
# Deleting domain
del_web_config
del_web_config "$WEB_SYSTEM" "$TPL.stpl"
# Checking proxy
if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
del_web_config
del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
fi
# Deleting old certificate
@ -68,24 +64,6 @@ chown -R $user:$user $tmpdir
# Update config
update_object_value 'web' 'DOMAIN' "$domain" '$SSL' 'no'
# Checking last SSL domain
ssl_dom=$(grep "SSL='yes'" $USER_DATA/web.conf)
conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
if [ -z "$ssl_dom" ]; then
sed -i "/.*\/$user\/.*s$WEB_SYSTEM.conf/d" $conf
rm -f $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf
fi
# Checking proxy
if [ ! -z "$PROXY_SYSTEM" ]; then
conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
if [ -z "$ssl_dom" ]; then
sed -i "/.*\/$user\/.*s$PROXY_SYSTEM.conf/d" $conf
rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
fi
fi
# Decreasing domain value
decrease_user_value "$user" '$U_WEB_SSL'
@ -102,6 +80,6 @@ fi
# Logging
log_history "disabled ssl support for $domain"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit