From 4a4dcb180453545c54b9de1e3228bec5b89f9d00 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Tue, 5 Jul 2011 00:33:11 +0300
Subject: [PATCH] renamed httpd_add_config to add_web_config

---
 bin/v_add_web_domain        | 4 ++--
 bin/v_add_web_domain_nginx  | 4 ++--
 bin/v_add_web_domain_ssl    | 2 +-
 bin/v_change_web_domain_tpl | 4 ++--
 bin/v_rebuild_web_domains   | 4 ++--
 func/domain_func.sh         | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain
index bd72818d5..d17eab165 100755
--- a/bin/v_add_web_domain
+++ b/bin/v_add_web_domain
@@ -80,7 +80,7 @@ else
     aliases_idn="$domain_alias_idn"
 fi
 
-# Defining vars for httpd_add_config function
+# Defining vars for add_config function
 web_port=$(get_config_value '$WEB_PORT')
 group="$user"
 email="$user@$domain"
@@ -102,7 +102,7 @@ else
 fi
 
 # Adding domain to the httpd.conf
-httpd_add_config
+add_web_config
 
 # Building directory tree
 mkdir $V_HOME/$user/domains/$domain \
diff --git a/bin/v_add_web_domain_nginx b/bin/v_add_web_domain_nginx
index 588f603a1..68df11bd1 100755
--- a/bin/v_add_web_domain_nginx
+++ b/bin/v_add_web_domain_nginx
@@ -78,7 +78,7 @@ fi
 # Adding domain to the nginx.conf
 tpl_file="$V_WEBTPL/ngingx_vhost_$template.tpl"
 conf="$V_HOME/$user/conf/nginx.conf"
-httpd_add_config
+add_web_config
 
 # Checking vesta nginx config
 main_conf='/etc/nginx/conf.d/vesta_users.conf'
@@ -105,7 +105,7 @@ if [ ! -z "$cert" ]; then
     # Adding domain to the snginx.conf
     conf="$V_HOME/$user/conf/snginx.conf"
     tpl_file="$V_WEBTPL/ngingx_vhost_$template.stpl"
-    httpd_add_config
+    add_web_config
 
     # Checking vesta nginx config
     main_conf='/etc/nginx/conf.d/vesta_users.conf'
diff --git a/bin/v_add_web_domain_ssl b/bin/v_add_web_domain_ssl
index 64b69be9d..3f4160d8c 100755
--- a/bin/v_add_web_domain_ssl
+++ b/bin/v_add_web_domain_ssl
@@ -92,7 +92,7 @@ else
 fi
 
 # Adding domain to the httpd.conf
-httpd_add_config
+add_web_config
 
 # Adding certificate to user dir
 if [ ! -e "$ssl_cert" ]; then
diff --git a/bin/v_change_web_domain_tpl b/bin/v_change_web_domain_tpl
index a0bee7226..456f8c32d 100755
--- a/bin/v_change_web_domain_tpl
+++ b/bin/v_change_web_domain_tpl
@@ -96,7 +96,7 @@ else
 fi
 
 # Adding domain to the httpd.conf
-httpd_add_config
+add_web_config
 
 # Running template trigger
 if [ -x $V_WEBTPL/apache_$template.sh ]; then
@@ -118,7 +118,7 @@ if [ ! -z "$cert" = 'yes' ]; then
     tpl_file="$V_WEBTPL/apache_$template.stpl"
 
     # Adding domain to the httpd.conf
-    httpd_add_config
+    add_web_config
 
     # Running template trigger
     if [ -x $V_WEBTPL/apache_$template.sh ]; then
diff --git a/bin/v_rebuild_web_domains b/bin/v_rebuild_web_domains
index e361f140c..9a41bafe0 100755
--- a/bin/v_rebuild_web_domains
+++ b/bin/v_rebuild_web_domains
@@ -77,7 +77,7 @@ for domain in $domains; do
 
     # Adding domain to the tmp_httpd.conf
     conf="$V_HOME/$user/conf/tmp_httpd.conf"
-    httpd_add_config
+    add_web_config
 
     # Running template trigger
     if [ -x $V_WEBTPL/apache_$template.sh ]; then
@@ -101,7 +101,7 @@ for domain in $domains; do
         # Adding domain to the shttpd.conf
         conf="$V_HOME/$user/conf/tmp_shttpd.conf"
         tpl_file="$V_WEBTPL/apache_$template.stpl"
-        httpd_add_config
+        add_web_config
 
         # Running template trigger
         if [ -x $V_WEBTPL/apache_$template.sh ]; then
diff --git a/func/domain_func.sh b/func/domain_func.sh
index d493a1606..e3993e286 100644
--- a/func/domain_func.sh
+++ b/func/domain_func.sh
@@ -219,7 +219,7 @@ sort_dns_records() {
     mv -f $conf.tmp $conf
 }
 
-httpd_add_config() {
+add_web_config() {
     # Adding template to config
     cat $tpl_file | \
         sed -e "s/%ip%/$ip/g" \