From d85b468c59eba6985d0a5471056bbff5ccf10e7f Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Mon, 20 Feb 2012 16:44:55 +0200
Subject: [PATCH] added counters in domain rebuild functions

---
 bin/v_rebuild_dns_domains  | 16 +++++++---------
 bin/v_rebuild_web_domains  | 22 ++++++++++++++++++++++
 bin/v_update_user_counters |  3 ++-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/bin/v_rebuild_dns_domains b/bin/v_rebuild_dns_domains
index bbe5b25f..365089d4 100755
--- a/bin/v_rebuild_dns_domains
+++ b/bin/v_rebuild_dns_domains
@@ -44,6 +44,7 @@ is_user_suspended
 #                       Action                             #
 #----------------------------------------------------------#
 
+user_domains=0
 user_records=0
 suspended_dns=0
 
@@ -77,18 +78,13 @@ done
 for domain in $domains; do
 
     # Defining variables
+    get_domain_values 'dns'
     domain_idn=$(idn -t --quiet -a "$domain")
-    ip="$(get_domain_value 'dns' '$IP')"
-    template="$(get_domain_value 'dns' '$TPL')"
-    exp="$(get_domain_value 'dns' '$EXP')"
-    soa="$(get_domain_value 'dns' '$SOA')"
-    ttl="$(get_domain_value 'dns' '$TTL')"
-    suspended="$(get_domain_value 'dns' '$SUSPENDED')"
 
     # Checking zone file
     if [ ! -e "$V_USERS/$user/dns/$domain" ]; then
-        cat $V_DNSTPL/$template.tpl |\
-            sed -e "s/%ip%/$ip/g" \
+        cat $V_DNSTPL/$TPL.tpl |\
+            sed -e "s/%ip%/$IP/g" \
                 -e "s/%domain_idn%/$domain_idn/g" \
                 -e "s/%domain%/$domain/g" \
                 -e "s/%ns1%/$ns1/g" \
@@ -115,7 +111,7 @@ for domain in $domains; do
     # Bind config check
     nconf='/etc/named.conf'
 
-    if [ "$suspended" = 'yes' ]; then
+    if [ "$SUSPENDED" = 'yes' ]; then
 	rm_string=$(grep -n /etc/namedb/$domain.db $nconf | cut -d : -f 1)
         if [ ! -z "$rm_string" ]; then
             sed -i "$rm_string d" $nconf
@@ -128,6 +124,7 @@ for domain in $domains; do
             echo "$named" >> /etc/named.conf
         fi
     fi
+    user_domains=$((user_domains + 1))
     records=$(wc -l $V_USERS/$user/dns/$domain | cut -f 1 -d ' ')
     user_records=$((user_records + records))
     update_domain_value 'dns' '$RECORDS' "$records"
@@ -139,6 +136,7 @@ done
 #----------------------------------------------------------#
 
 # Updating counters
+update_user_value "$user" '$U_DNS_DOMAINS' "$user_domains"
 update_user_value "$user" '$U_DNS_RECORDS' "$user_records"
 update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 
diff --git a/bin/v_rebuild_web_domains b/bin/v_rebuild_web_domains
index 17ec4665..787d3cc7 100755
--- a/bin/v_rebuild_web_domains
+++ b/bin/v_rebuild_web_domains
@@ -45,6 +45,11 @@ is_user_suspended
 #                       Action                             #
 #----------------------------------------------------------#
 
+user_domains=0
+user_ssl=0
+user_aliases=0
+suspended_web=0
+
 # Clean up old config
 rm -f $V_HOME/$user/conf/tmp_*.conf
 
@@ -75,6 +80,12 @@ for domain in $(shell_list) ; do
         $V_WEBTPL/apache_$TPL.sh $user $domain $ip $V_HOME $docroot
     fi
 
+    # Checking aliases
+    if [ ! -z "$ALIAS" ]; then
+        aliases=$(echo "$ALIAS"|tr ',' '\n'| wc -l)
+        user_aliases=$((user_aliases + aliases))
+    fi
+
     # Checking stats
     if [ ! -z "$STATS" ]; then
     cat $V_WEBTPL/$STATS.tpl |\
@@ -123,6 +134,7 @@ for domain in $(shell_list) ; do
             $V_WEBTPL/apache_$TPL.sh $user $domain $ip $V_HOME $docroot
         fi
 
+        user_ssl=$((user_ssl + 1))
         ssl_change='yes'
     fi
 
@@ -149,6 +161,10 @@ for domain in $(shell_list) ; do
         fi
 	ngix_change='yes'
     fi
+    if [ "$SUSPENDED" = 'yes' ]; then
+        suspended_web=$((suspended_web + 1))
+    fi
+    user_domains=$((user_domains + 1))
 done
 
 # Renaming tmp config
@@ -206,6 +222,12 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
+# Updating counters
+update_user_value "$user" '$SUSPENDED_WEB' "$suspended_web"
+update_user_value "$user" '$U_WEB_DOMAINS' "$user_domains"
+update_user_value "$user" '$U_WEB_SSL' "$user_ssl"
+update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases"
+
 # Adding task to the vesta pipe
 restart_schedule 'web'
 
diff --git a/bin/v_update_user_counters b/bin/v_update_user_counters
index d685d8e1..e45065cb 100755
--- a/bin/v_update_user_counters
+++ b/bin/v_update_user_counters
@@ -104,10 +104,12 @@ for user in $user_list; do
     fi    
 
     # Checking web system
+    U_WEB_DOMAINS=0
     for domain_str in $(cat $V_USERS/$user/web.conf) ;do
         eval $domain_str
         U_DISK_WEB=$((U_DISK_WEB + U_DISK))
         U_WEB_DOMAINS=$((U_WEB_DOMAINS + 1))
+
         if [ "$SSL" = 'yes' ]; then
             U_WEB_SSL=$((U_WEB_SSL + 1))
         fi
@@ -116,7 +118,6 @@ for user in $user_list; do
         fi
         if [ ! -z "$ALIAS" ]; then
             aliases=$(echo "$ALIAS"|tr ',' '\n'| wc -l)
-            aliases=$((aliases + 1))
             U_WEB_ALIASES=$((U_WEB_ALIASES + aliases))
         fi
         BANDWIDTH=$((BANDWIDTH + U_BANDWIDTH))