From d708923022709bb4815bb58691b3148e2efaca79 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Sun, 14 Aug 2011 14:53:55 +0300
Subject: [PATCH] renamed web_domains.conf to web.conf

---
 bin/v_add_sys_user           |  2 +-
 bin/v_add_web_domain         |  2 +-
 bin/v_del_web_domain         |  4 ++--
 bin/v_del_web_domain_nginx   |  2 +-
 bin/v_del_web_domain_ssl     |  4 ++--
 bin/v_list_web_domain        |  2 +-
 bin/v_list_web_domains       |  2 +-
 bin/v_list_web_domains_alias |  2 +-
 bin/v_list_web_domains_elog  |  2 +-
 bin/v_list_web_domains_nginx |  2 +-
 bin/v_list_web_domains_ssl   |  2 +-
 bin/v_list_web_domains_stats |  2 +-
 bin/v_rebuild_web_domains    |  2 +-
 bin/v_suspend_web_domains    |  2 +-
 bin/v_unsuspend_web_domains  |  2 +-
 bin/v_upd_sys_user_bill      |  2 +-
 bin/v_upd_web_domains_disk   |  2 +-
 bin/v_upd_web_domains_traff  |  2 +-
 func/cert_func.sh            |  2 +-
 func/domain_func.sh          | 16 ++++++++--------
 func/ip_func.sh              |  2 +-
 func/shared_func.sh          | 12 ++++++------
 22 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/bin/v_add_sys_user b/bin/v_add_sys_user
index 1128c7ae3..194408c17 100755
--- a/bin/v_add_sys_user
+++ b/bin/v_add_sys_user
@@ -118,7 +118,7 @@ echo "v_upd_sys_user_disk $user" >> $V_QUEUE/disk.pipe
 
 if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
     mkdir $V_USERS/$user/cert
-    touch $V_USERS/$user/web_domains.conf
+    touch $V_USERS/$user/web.conf
     echo "v_upd_web_domains_traff $user" >> $V_QUEUE/traffic.pipe
     echo "v_upd_web_domains_disk $user" >> $V_QUEUE/disk.pipe
 fi
diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain
index cd36eb252..ae8caf7ff 100755
--- a/bin/v_add_web_domain
+++ b/bin/v_add_web_domain
@@ -187,7 +187,7 @@ v_str="$v_str SSL_HOME='' SSL_CERT=''"
 v_str="$v_str NGINX='' NGINX_EXT='' SUSPEND='no' DATE='$V_DATE'"
 
 # Registering domain
-echo "$v_str" >>$V_USERS/$user/web_domains.conf
+echo "$v_str" >>$V_USERS/$user/web.conf
 
 # Adding task to the vesta pipe
 restart_schedule 'web'
diff --git a/bin/v_del_web_domain b/bin/v_del_web_domain
index d2c3150ce..ee2e1e47a 100755
--- a/bin/v_del_web_domain
+++ b/bin/v_del_web_domain
@@ -101,13 +101,13 @@ rm -rf /var/log/httpd/domains/$domain.error*
 del_web_domain
 
 # Checking last ssl domain
-ssl_dom=$(grep -v "SSL_CERT=''" $V_USERS/$user/web_domains.conf | wc -l)
+ssl_dom=$(grep -v "SSL_CERT=''" $V_USERS/$user/web.conf | wc -l)
 if [ "$ssl_dom" -eq '0' ]; then
     sed -i "s/ Include /#Include /"  $V_HOME/$user/conf/httpd.conf
 fi
 
 # Checking last domain
-domains=$(wc -l $V_USERS/$user/web_domains.conf|cut -f 1 -d ' ')
+domains=$(wc -l $V_USERS/$user/web.conf|cut -f 1 -d ' ')
 if [ "$domains" -eq '0' ]; then
     conf='/etc/httpd/conf.d/vesta.conf'
     line=$(grep -n "$V_HOME/$user/conf/httpd.conf" $conf | cut -f 1 -d : )
diff --git a/bin/v_del_web_domain_nginx b/bin/v_del_web_domain_nginx
index 63fdf00a9..bc87bebc3 100755
--- a/bin/v_del_web_domain_nginx
+++ b/bin/v_del_web_domain_nginx
@@ -77,7 +77,7 @@ update_web_domain_value '$NGINX_EXT' ''
 
 # Checking last nginx domain
 conf='/etc/nginx/conf.d/vesta_users.conf'
-last_nginx=$(grep -v "NGINX=''" $V_USERS/$user/web_domains.conf)
+last_nginx=$(grep -v "NGINX=''" $V_USERS/$user/web.conf)
 last_snginx=$(echo "$last_nginx" | grep -v "SSL_CERT=''")
 if [  -z "$last_snginx" ]; then
     sline=$(grep -n "$V_HOME/$user/conf/snginx.conf" $conf | cut -f 1 -d : )
diff --git a/bin/v_del_web_domain_ssl b/bin/v_del_web_domain_ssl
index 4aa0f3aeb..897eab9b9 100755
--- a/bin/v_del_web_domain_ssl
+++ b/bin/v_del_web_domain_ssl
@@ -71,7 +71,7 @@ update_web_domain_value '$SSL_HOME' ''
 update_web_domain_value '$SSL_CERT' ''
 
 # Checking last ssl domain
-ssl_dom=$(grep -v "SSL_CERT=''" $V_USERS/$user/web_domains.conf)
+ssl_dom=$(grep -v "SSL_CERT=''" $V_USERS/$user/web.conf)
 main_conf='/etc/httpd/conf.d/vesta.conf'
 conf="$V_HOME/$user/conf/shttpd.conf"
 if [ -z "$ssl_dom" ]; then
@@ -83,7 +83,7 @@ fi
 decrease_user_value "$user" '$U_WEB_SSL'
 
 # Checking cert parents
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 field='$DOMAIN'
 search_string="SSL_CERT='$cert'"
 cert_parents=$(dom_clear_search)
diff --git a/bin/v_list_web_domain b/bin/v_list_web_domain
index 51ff4e14f..036236077 100755
--- a/bin/v_list_web_domain
+++ b/bin/v_list_web_domain
@@ -36,7 +36,7 @@ is_web_domain_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 fields='$DOMAIN $IP $U_DISK $U_BANDWIDTH $TPL $ALIAS $PHP $CGI $ELOG $STATS
diff --git a/bin/v_list_web_domains b/bin/v_list_web_domains
index 363106f1e..4d5147dd7 100755
--- a/bin/v_list_web_domains
+++ b/bin/v_list_web_domains
@@ -35,7 +35,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 fields='$DOMAIN $IP $U_DISK $U_BANDWIDTH $TPL $ALIAS $PHP $CGI $ELOG $STATS
diff --git a/bin/v_list_web_domains_alias b/bin/v_list_web_domains_alias
index 85c1733fd..64526de1a 100755
--- a/bin/v_list_web_domains_alias
+++ b/bin/v_list_web_domains_alias
@@ -35,7 +35,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 fields='$DOMAIN $ALIAS'
diff --git a/bin/v_list_web_domains_elog b/bin/v_list_web_domains_elog
index 31cadbbf9..7397f62f9 100755
--- a/bin/v_list_web_domains_elog
+++ b/bin/v_list_web_domains_elog
@@ -35,7 +35,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 fields='$DOMAIN $ELOG'
diff --git a/bin/v_list_web_domains_nginx b/bin/v_list_web_domains_nginx
index 98b4eca76..c45bb4f0e 100755
--- a/bin/v_list_web_domains_nginx
+++ b/bin/v_list_web_domains_nginx
@@ -35,7 +35,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 fields='$DOMAIN $NGINX'
diff --git a/bin/v_list_web_domains_ssl b/bin/v_list_web_domains_ssl
index 69484e38c..d55ddc061 100755
--- a/bin/v_list_web_domains_ssl
+++ b/bin/v_list_web_domains_ssl
@@ -35,7 +35,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 fields='$DOMAIN $SSL $SSL_HOME $SSL_CERT'
diff --git a/bin/v_list_web_domains_stats b/bin/v_list_web_domains_stats
index 08135ee5e..a1481fffa 100755
--- a/bin/v_list_web_domains_stats
+++ b/bin/v_list_web_domains_stats
@@ -35,7 +35,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 fields='$DOMAIN $STATS $STATS_AUTH'
diff --git a/bin/v_rebuild_web_domains b/bin/v_rebuild_web_domains
index 4dc1d3c31..a63ec5ad9 100755
--- a/bin/v_rebuild_web_domains
+++ b/bin/v_rebuild_web_domains
@@ -40,7 +40,7 @@ is_user_suspended
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining search string
 search_string="DOMAIN"
diff --git a/bin/v_suspend_web_domains b/bin/v_suspend_web_domains
index e84690c8c..1dfd8daa5 100755
--- a/bin/v_suspend_web_domains
+++ b/bin/v_suspend_web_domains
@@ -39,7 +39,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 field='$DOMAIN'
diff --git a/bin/v_unsuspend_web_domains b/bin/v_unsuspend_web_domains
index c4bf07fe0..886056220 100755
--- a/bin/v_unsuspend_web_domains
+++ b/bin/v_unsuspend_web_domains
@@ -36,7 +36,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 field='$DOMAIN'
diff --git a/bin/v_upd_sys_user_bill b/bin/v_upd_sys_user_bill
index 5c15c84b0..dda0a4c0f 100755
--- a/bin/v_upd_sys_user_bill
+++ b/bin/v_upd_sys_user_bill
@@ -58,7 +58,7 @@ for user in $user_list; do
         U_DISK_WEB_DOMAINS=''
 
         # Defining config
-        conf="$V_USERS/$user/web_domains.conf"
+        conf="$V_USERS/$user/web.conf"
 
         # Defining fileds to select
         field='$DOMAIN'
diff --git a/bin/v_upd_web_domains_disk b/bin/v_upd_web_domains_disk
index 14941a759..6f10d9758 100755
--- a/bin/v_upd_web_domains_disk
+++ b/bin/v_upd_web_domains_disk
@@ -36,7 +36,7 @@ is_user_valid
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 field='$DOMAIN'
diff --git a/bin/v_upd_web_domains_traff b/bin/v_upd_web_domains_traff
index 30bb9929b..eb0349e09 100755
--- a/bin/v_upd_web_domains_traff
+++ b/bin/v_upd_web_domains_traff
@@ -36,7 +36,7 @@ is_user_valid "$user"
 #----------------------------------------------------------#
 
 # Defining config
-conf="$V_USERS/$user/web_domains.conf"
+conf="$V_USERS/$user/web.conf"
 
 # Defining fileds to select
 field='$DOMAIN'
diff --git a/func/cert_func.sh b/func/cert_func.sh
index 2c71504ce..2deb403c5 100644
--- a/func/cert_func.sh
+++ b/func/cert_func.sh
@@ -65,7 +65,7 @@ is_cert_valid() {
 
 is_cert_used() {
     # Parsing config
-    check_cert=$(grep "SSL_CERT='$cert'" $V_USERS/$user/web_domains.conf)
+    check_cert=$(grep "SSL_CERT='$cert'" $V_USERS/$user/web.conf)
 
     # Checking result
     if [ ! -z "$check_cert" ]; then
diff --git a/func/domain_func.sh b/func/domain_func.sh
index 6f69667c7..ee3dac583 100644
--- a/func/domain_func.sh
+++ b/func/domain_func.sh
@@ -63,10 +63,10 @@ is_dns_domain_free() {
 is_web_domain_free() {
     search_dom=${1-$domain}
     # Parsing domain values
-    check_domain=$(grep -F "IN='$search_dom'" $V_USERS/$user/web_domains.conf)
+    check_domain=$(grep -F "IN='$search_dom'" $V_USERS/$user/web.conf)
 
     # Parsing alias values
-    check_alias=$(grep -F 'ALIAS=' $V_USERS/$user/web_domains.conf | \
+    check_alias=$(grep -F 'ALIAS=' $V_USERS/$user/web.conf | \
         awk -F "ALIAS=" '{print $2}' | \
         cut -f 2 -d \' | \
         sed -e "s/,/\n/g" | \
@@ -94,7 +94,7 @@ is_dns_domain_valid() {
 
 is_web_domain_valid() {
     # Parsing domain values
-    check_domain=$(grep -F "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf)
+    check_domain=$(grep -F "DOMAIN='$domain'" $V_USERS/$user/web.conf)
 
     # Checking result
     if [ -z "$check_domain" ]; then
@@ -288,7 +288,7 @@ get_web_domain_value() {
     key="$1"
 
     # Parsing domains
-    string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf )
+    string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
 
     # Parsing key=value
     for keys in $string; do
@@ -325,7 +325,7 @@ update_web_domain_value() {
     value="$2"
 
     # Defining conf
-    conf="$V_USERS/$user/web_domains.conf"
+    conf="$V_USERS/$user/web.conf"
 
     # Parsing conf
     domain_str=$(grep -n "DOMAIN='$domain'" $conf)
@@ -386,7 +386,7 @@ is_web_domain_key_empty() {
     key="$1"
 
     # Parsing domains
-    string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf )
+    string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
 
     # Parsing key=value
     for keys in $string; do
@@ -419,7 +419,7 @@ is_web_domain_value_exist() {
     key="$1"
 
     # Parsing domains
-    string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf )
+    string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
 
     # Parsing key=value
     for keys in $string; do
@@ -483,7 +483,7 @@ del_dns_domain() {
 }
 
 del_web_domain() {
-    conf="$V_USERS/$user/web_domains.conf"
+    conf="$V_USERS/$user/web.conf"
 
     # Parsing domains
     string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )
diff --git a/func/ip_func.sh b/func/ip_func.sh
index 4f1952e5e..8d0b9d24c 100644
--- a/func/ip_func.sh
+++ b/func/ip_func.sh
@@ -188,7 +188,7 @@ decrease_ip_value() {
     new_web=$((current_web - 1))
 
     # -1 user
-    check_ip=$(grep $sip $V_USERS/$user/web_domains.conf |wc -l)
+    check_ip=$(grep $sip $V_USERS/$user/web.conf |wc -l)
     if [ "$check_ip" -lt 2 ]; then
         new_usr=$(echo "$current_usr" |\
             sed -e "s/,/\n/g"|\
diff --git a/func/shared_func.sh b/func/shared_func.sh
index 5b9c0b020..89c14b286 100644
--- a/func/shared_func.sh
+++ b/func/shared_func.sh
@@ -440,7 +440,7 @@ is_package_full() {
 
     web_domain() {
         # Checking zero domains
-        domain_number=$(wc -l $V_USERS/$user/web_domains.conf|cut -f 1 -d ' ')
+        domain_number=$(wc -l $V_USERS/$user/web.conf|cut -f 1 -d ' ')
 
         # Comparing current val with conf
         val=$(grep '^WEB_DOMAINS=' $V_USERS/$user/user.conf|cut -f 2 -d \' )
@@ -453,7 +453,7 @@ is_package_full() {
 
     web_alias() {
         # Parsing aliases
-        alias_nmb=$(grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf|\
+        alias_nmb=$(grep "DOMAIN='$domain'" $V_USERS/$user/web.conf|\
             awk -F "ALIAS=" '{print $2}' | cut -f 2 -d \' |\
             sed -e "s/,/\n/g" | wc -l )
 
@@ -476,7 +476,7 @@ is_package_full() {
         fi
 
         # Checking domains
-        domain_nmb=$(grep "SSL='yes'" $V_USERS/$user/web_domains.conf | wc -l)
+        domain_nmb=$(grep "SSL='yes'" $V_USERS/$user/web.conf | wc -l)
         # Comparing current val with conf
         if [ "$domain_nmb" -ge "$val" ]; then
             echo "Error: Upgrade package"
@@ -1198,9 +1198,9 @@ get_usr_disk() {
     size=$((size + dir_usage))
 
     # Checking web
-    if [ -f "$V_USERS/$user/web_domains.conf" ]; then
+    if [ -f "$V_USERS/$user/web.conf" ]; then
 	# Using tricky way to parse configs
-	disk_usage=$(grep 'U_DISK=' $V_USERS/$user/web_domains.conf |\
+	disk_usage=$(grep 'U_DISK=' $V_USERS/$user/web.conf |\
 	    awk -F "U_DISK='" '{print $2}'|cut -f 1 -d "'")
 	for disk in $disk_usage; do 
 	    size=$((size + disk))
@@ -1232,7 +1232,7 @@ get_usr_disk() {
 
 get_usr_traff() {
     size='0'
-    conf='web_domains.conf'
+    conf='web.conf'
 
     # Checking web
     if [ -f "$V_USERS/$user/$conf" ]; then