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

moved web/proxy port values to global config

Browse source
This commit is contained in:
Serghey Rodin 2011-06-26 14:16:59 +03:00
commit e11a13c16c
7 changed files with 29 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v_add_web_domain
View file

@ -81,7 +81,7 @@ else
fi
# Defining vars for httpd_add_config function
port=$(get_web_port)
port=$(get_config_value '$WEB_PORT')
group="$user"
email="$user@$domain"
docroot="$V_HOME/$user/domains/$domain/public_html"

2
bin/v_add_web_domain_ssl
View file

@ -68,7 +68,7 @@ is_template_valid 'web'
#----------------------------------------------------------#
# Defining variables for template replace
port=$(get_web_port_ssl)
port=$(get_config_value '$WEB_SSL_PORT')
aliases=$(get_web_domain_value '$ALIAS')
aliases_idn=$(idn -t --quiet -a "$aliases")
email="$user@$domain"

4
bin/v_change_web_domain_tpl
View file

@ -73,7 +73,7 @@ fi
# Defining variables for template replace
ip=$(get_web_domain_value '$IP')
aliases=$(get_web_domain_value '$ALIAS')
port=$(get_web_port)
port=$(get_config_value '$WEB_PORT')
email="$user@$domain"
docroot="$V_HOME/$user/domains/$domain/public_html"
conf="$V_HOME/$user/conf/httpd.conf"
@ -91,7 +91,7 @@ fi
# Checking ssl
if [ "$ssl" = 'yes' ]; then
# Defining variables for ssl template replace
port=$(get_web_port_ssl)
port=$(get_config_value '$WEB_SSL_PORT')
tpl_option=$(get_web_domain_value '$SSL_HOME')
cert=$(get_web_domain_value '$SSL_CERT')
ssl_cert="$V_HOME/$user/conf/$cert.crt"

3
bin/v_rebuild_web_domains
View file

@ -58,7 +58,7 @@ for domain in $domains; do
template=$(get_web_domain_value '$TPL')
tpl_file="$V_WEBTPL/apache_$template.tpl"
ip=$(get_web_domain_value '$IP')
port=$(get_web_port)
port=$(get_config_value '$WEB_PORT')
domain=$(get_web_domain_value '$DOMAIN')
domain_idn=$(idn -t --quiet -a "$domain")
group="$user"
@ -89,6 +89,7 @@ for domain in $domains; do
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;;
*) check_args '3' "$#" 'user domain certificate [sslhome]'
esac
port=$(get_config_value '$WEB_SSL_PORT')
# Adding domain to the httpd.conf
conf="$V_HOME/$user/conf/tmp_shttpd.conf"