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

renamed httpd_add_config to add_web_config

Browse source
This commit is contained in:
Serghey Rodin 2011-07-05 00:33:11 +03:00
commit 4a4dcb1804
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/v_add_web_domain
View file

@ -80,7 +80,7 @@ else
aliases_idn="$domain_alias_idn" aliases_idn="$domain_alias_idn"
fi fi
# Defining vars for httpd_add_config function # Defining vars for add_config function
web_port=$(get_config_value '$WEB_PORT') web_port=$(get_config_value '$WEB_PORT')
group="$user" group="$user"
email="$user@$domain" email="$user@$domain"
@ -102,7 +102,7 @@ else
fi fi
# Adding domain to the httpd.conf # Adding domain to the httpd.conf
httpd_add_config add_web_config
# Building directory tree # Building directory tree
mkdir $V_HOME/$user/domains/$domain \ mkdir $V_HOME/$user/domains/$domain \

4
bin/v_add_web_domain_nginx
View file

@ -78,7 +78,7 @@ fi
# Adding domain to the nginx.conf # Adding domain to the nginx.conf
tpl_file="$V_WEBTPL/ngingx_vhost_$template.tpl" tpl_file="$V_WEBTPL/ngingx_vhost_$template.tpl"
conf="$V_HOME/$user/conf/nginx.conf" conf="$V_HOME/$user/conf/nginx.conf"
httpd_add_config add_web_config
# Checking vesta nginx config # Checking vesta nginx config
main_conf='/etc/nginx/conf.d/vesta_users.conf' main_conf='/etc/nginx/conf.d/vesta_users.conf'
@ -105,7 +105,7 @@ if [ ! -z "$cert" ]; then
# Adding domain to the snginx.conf # Adding domain to the snginx.conf
conf="$V_HOME/$user/conf/snginx.conf" conf="$V_HOME/$user/conf/snginx.conf"
tpl_file="$V_WEBTPL/ngingx_vhost_$template.stpl" tpl_file="$V_WEBTPL/ngingx_vhost_$template.stpl"
httpd_add_config add_web_config
# Checking vesta nginx config # Checking vesta nginx config
main_conf='/etc/nginx/conf.d/vesta_users.conf' main_conf='/etc/nginx/conf.d/vesta_users.conf'

2
bin/v_add_web_domain_ssl
View file

@ -92,7 +92,7 @@ else
fi fi
# Adding domain to the httpd.conf # Adding domain to the httpd.conf
httpd_add_config add_web_config
# Adding certificate to user dir # Adding certificate to user dir
if [ ! -e "$ssl_cert" ]; then if [ ! -e "$ssl_cert" ]; then

4
bin/v_change_web_domain_tpl
View file

@ -96,7 +96,7 @@ else
fi fi
# Adding domain to the httpd.conf # Adding domain to the httpd.conf
httpd_add_config add_web_config
# Running template trigger # Running template trigger
if [ -x $V_WEBTPL/apache_$template.sh ]; then if [ -x $V_WEBTPL/apache_$template.sh ]; then
@ -118,7 +118,7 @@ if [ ! -z "$cert" = 'yes' ]; then
tpl_file="$V_WEBTPL/apache_$template.stpl" tpl_file="$V_WEBTPL/apache_$template.stpl"
# Adding domain to the httpd.conf # Adding domain to the httpd.conf
httpd_add_config add_web_config
# Running template trigger # Running template trigger
if [ -x $V_WEBTPL/apache_$template.sh ]; then if [ -x $V_WEBTPL/apache_$template.sh ]; then

4
bin/v_rebuild_web_domains
View file

@ -77,7 +77,7 @@ for domain in $domains; do
# Adding domain to the tmp_httpd.conf # Adding domain to the tmp_httpd.conf
conf="$V_HOME/$user/conf/tmp_httpd.conf" conf="$V_HOME/$user/conf/tmp_httpd.conf"
httpd_add_config add_web_config
# Running template trigger # Running template trigger
if [ -x $V_WEBTPL/apache_$template.sh ]; then if [ -x $V_WEBTPL/apache_$template.sh ]; then
@ -101,7 +101,7 @@ for domain in $domains; do
# Adding domain to the shttpd.conf # Adding domain to the shttpd.conf
conf="$V_HOME/$user/conf/tmp_shttpd.conf" conf="$V_HOME/$user/conf/tmp_shttpd.conf"
tpl_file="$V_WEBTPL/apache_$template.stpl" tpl_file="$V_WEBTPL/apache_$template.stpl"
httpd_add_config add_web_config
# Running template trigger # Running template trigger
if [ -x $V_WEBTPL/apache_$template.sh ]; then if [ -x $V_WEBTPL/apache_$template.sh ]; then

2
func/domain_func.sh
View file

@ -219,7 +219,7 @@ sort_dns_records() {
mv -f $conf.tmp $conf mv -f $conf.tmp $conf
} }
httpd_add_config() { add_web_config() {
# Adding template to config # Adding template to config
cat $tpl_file | \ cat $tpl_file | \
sed -e "s/%ip%/$ip/g" \ sed -e "s/%ip%/$ip/g" \