github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-21 13:54:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #816 from onbalt/patch-2

Browse source 
Wrong variable names in v-change-web-domain- tpl
This commit is contained in:
Serghey Rodin 2016-08-29 16:53:54 +03:00 • committed by GitHub
commit f1f1bd7ec3
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bin/v-change-web-domain-backend-tpl
View file

@ -45,7 +45,7 @@ is_backend_template_valid $template
prepare_web_backend prepare_web_backend
# Deleting backend # Deleting backend
rm -f $pool/$backend.conf rm -f $pool/$backend_type.conf
# Allocating backend port # Allocating backend port
backend_port=9000 backend_port=9000
@ -63,10 +63,10 @@ cat $WEBTPL/$WEB_BACKEND/$template.tpl |\
-e "s|%user%|$user|"\ -e "s|%user%|$user|"\
-e "s|%domain%|$domain|"\ -e "s|%domain%|$domain|"\
-e "s|%domain_idn%|$domain_idn|"\ -e "s|%domain_idn%|$domain_idn|"\
-e "s|%backend%|$backend|g" > $pool/$backend.conf -e "s|%backend%|$backend_type|g" > $pool/$backend_type.conf
# Checking backend pool configuration # Checking backend pool configuration
if [ "$backend" = "$user" ]; then if [ "$backend_type" = "$user" ]; then
conf=$USER_DATA/web.conf conf=$USER_DATA/web.conf
fields='$DOMAIN' fields='$DOMAIN'
nohead=1 nohead=1

4
bin/v-change-web-domain-tpl
View file

@ -54,9 +54,9 @@ fi
# Defining variables for new vhost config # Defining variables for new vhost config
prepare_web_domain_values prepare_web_domain_values
add_web_config "$WEB_SYSTEM" "$TPL.tpl" add_web_config "$WEB_SYSTEM" "$template.tpl"
if [ "$SSL" = 'yes' ]; then if [ "$SSL" = 'yes' ]; then
add_web_config "$WEB_SYSTEM" "$TPL.stpl" add_web_config "$WEB_SYSTEM" "$template.stpl"
fi fi