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

fix suspend/unsuspend feature

Browse source
This commit is contained in:
Serghey Rodin 2016-07-18 20:16:22 +03:00
commit 3c009479c0
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bin/v-add-web-domain
View file

@ -118,13 +118,14 @@ if [ ! -z "$WEB_BACKEND" ]; then
fi fi
$BIN/v-add-web-domain-backend "$user" "$domain" $BACKEND_TEMPLATE $BIN/v-add-web-domain-backend "$user" "$domain" $BACKEND_TEMPLATE
check_result $? "Backend error" >/dev/null check_result $? "Backend error" >/dev/null
prepare_web_backend
fi fi
# Preparing domain aliases # Preparing domain variables
ALIAS="$aliases"
if [ "$aliases" != 'none' ]; then if [ "$aliases" != 'none' ]; then
prepare_web_aliases "www.$domain,$aliases,$(get_ip_alias $domain)" ALIAS="www.$domain,$aliases,$(get_ip_alias $domain)"
fi fi
prepare_web_domain_values
# Adding web server config # Adding web server config
add_web_config "$WEB_SYSTEM" "$WEB_TEMPLATE.tpl" add_web_config "$WEB_SYSTEM" "$WEB_TEMPLATE.tpl"

4
func/domain.sh
View file

@ -200,8 +200,8 @@ add_web_config() {
-e "s|%user%|$user|g" \ -e "s|%user%|$user|g" \
-e "s|%group%|$user|g" \ -e "s|%group%|$user|g" \
-e "s|%home%|$HOMEDIR|g" \ -e "s|%home%|$HOMEDIR|g" \
-e "s|%docroot%|$HOMEDIR/$user/web/$domain/public_html|g" \ -e "s|%docroot%|$docroot|g" \
-e "s|%sdocroot%|$HOMEDIR/$user/web/$domain/public_html|g" \ -e "s|%sdocroot%|$sdocroot|g" \
-e "s|%ssl_crt%|$ssl_crt|g" \ -e "s|%ssl_crt%|$ssl_crt|g" \
-e "s|%ssl_key%|$ssl_key|g" \ -e "s|%ssl_key%|$ssl_key|g" \
-e "s|%ssl_pem%|$ssl_pem|g" \ -e "s|%ssl_pem%|$ssl_pem|g" \