From b4eda88053a6ac56d5c203447327f80237379dca Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Fri, 17 Aug 2012 16:39:54 +0300
Subject: [PATCH] replaced V_QUEUE variable

---
 bin/v_add_web_domain_stats    | 3 ++-
 bin/v_delete_web_domain       | 2 +-
 bin/v_delete_web_domain_stats | 2 +-
 bin/v_rebuild_web_domains     | 9 +++++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bin/v_add_web_domain_stats b/bin/v_add_web_domain_stats
index 4120fed1..9d225fbd 100755
--- a/bin/v_add_web_domain_stats
+++ b/bin/v_add_web_domain_stats
@@ -71,7 +71,8 @@ cat $WEBTPL/$type.tpl |\
 #----------------------------------------------------------#
 
 # Schedule statistic processing
-echo "$BIN/v_update_web_domain_stat $user $domain" >> $V_QUEUE/stats.pipe
+echo "$BIN/v_update_web_domain_stat $user $domain" >> \
+    $VESTA/data/queue/stats.pipe
 
 # Update config
 update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"
diff --git a/bin/v_delete_web_domain b/bin/v_delete_web_domain
index ba481881..047160cd 100755
--- a/bin/v_delete_web_domain
+++ b/bin/v_delete_web_domain
@@ -83,7 +83,7 @@ fi
 
 # Checking stats
 if [ ! -z "$STATS" ] && [ "$STATS" != 'no' ]; then
-    sed -i "/ $domain$/d" $V_QUEUE/stats.pipe
+    sed -i "/ $domain$/d" $VESTA/data/queue/stats.pipe
     rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
 fi
 
diff --git a/bin/v_delete_web_domain_stats b/bin/v_delete_web_domain_stats
index b035afbb..3ba402c9 100755
--- a/bin/v_delete_web_domain_stats
+++ b/bin/v_delete_web_domain_stats
@@ -56,7 +56,7 @@ rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
 #----------------------------------------------------------#
 
 # Deleting pipe command
-sed -i "/ $domain$/d" $V_QUEUE/stats.pipe
+sed -i "/ $domain$/d" $VESTA/data/queue/stats.pipe
 
 # Update config
 update_object_value 'web' 'DOMAIN' "$domain" '$STATS' ''
diff --git a/bin/v_rebuild_web_domains b/bin/v_rebuild_web_domains
index 315cdee9..572f20e7 100755
--- a/bin/v_rebuild_web_domains
+++ b/bin/v_rebuild_web_domains
@@ -70,6 +70,11 @@ for domain in $(shell_list) ; do
     if [ -e "$WEBTPL/skel/document_errors/" ]; then
         cp -r $WEBTPL/skel/document_errors/ $HOMEDIR/$user/web/$domain/
     fi
+
+    touch /var/log/httpd/domains/$domain.bytes \
+          /var/log/httpd/domains/$domain.log \
+          /var/log/httpd/domains/$domain.error.log
+
     chmod 551 $HOMEDIR/$user/web/$domain
     chmod 751 $HOMEDIR/$user/web/$domain/private
     chmod 751 $HOMEDIR/$user/web/$domain/cgi-bin
@@ -132,9 +137,9 @@ for domain in $(shell_list) ; do
                 > $HOMEDIR/$user/conf/web/$STATS.$domain.conf
 
         stats_string="$BIN/v_update_web_domain_stat $user $domain"
-        check_stats_pipe=$(grep "$stats_string" $V_QUEUE/stats.pipe)
+        check_stats_pipe=$(grep "$stats_string" $VESTA/data/queue/stats.pipe)
         if [ -z "$check_stats_pipe" ]; then
-            echo "$stats_string" >> $V_QUEUE/stats.pipe
+            echo "$stats_string" >> $VESTA/data/queue/stats.pipe
         fi
 
         if [ ! -z "$STATS_USER" ]; then