diff --git a/bin/v_add_web_domain_stats b/bin/v_add_web_domain_stats index 21793158d..ac007369d 100755 --- a/bin/v_add_web_domain_stats +++ b/bin/v_add_web_domain_stats @@ -72,7 +72,7 @@ cat $WEBTPL/$type.tpl |\ # Schedule statistic processing echo "$BIN/v_update_web_domain_stat $user $domain" >> \ - $VESTA/data/queue/stats.pipe + $VESTA/data/queue/webstats.pipe # Update config update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type" diff --git a/bin/v_delete_user b/bin/v_delete_user index 636fc978a..cddf9bcdc 100755 --- a/bin/v_delete_user +++ b/bin/v_delete_user @@ -85,9 +85,8 @@ if [ "$rv" -ne '0' ]; then fi # Deleteing user pipes -sed -i "/v_update_db_bases_disk $user$/d" $VESTA/data/queue/disk.pipe -sed -i "/v_update_web_domains_traff $user$/d" $VESTA/data/queue/traffic.pipe -sed -i "/v_update_web_domain_stat $user /d" $VESTA/data/queue/stats.pipe +sed -i "/ $user$/d" $VESTA/data/queue/disk.pipe +sed -i "/ $user$/d" $VESTA/data/queue/traffic.pipe # Removing system user /usr/sbin/userdel -f $user diff --git a/bin/v_delete_web_domain b/bin/v_delete_web_domain index ca5d78075..abcd051f8 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" $VESTA/data/queue/stats.pipe + sed -i "/ $domain$/d" $VESTA/data/queue/webstats.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 e97167fd3..886f58bad 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" $VESTA/data/queue/stats.pipe +sed -i "/ $domain$/d" $VESTA/data/queue/webstats.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 2465f4953..54c90041b 100755 --- a/bin/v_rebuild_web_domains +++ b/bin/v_rebuild_web_domains @@ -136,10 +136,10 @@ for domain in $(shell_list) ; do -e "s/%alias_idn%/${aliases_idn//,/ }/g" \ > $HOMEDIR/$user/conf/web/$STATS.$domain.conf - stats_string="$BIN/v_update_web_domain_stat $user $domain" - check_stats_pipe=$(grep "$stats_string" $VESTA/data/queue/stats.pipe) - if [ -z "$check_stats_pipe" ]; then - echo "$stats_string" >> $VESTA/data/queue/stats.pipe + webstats="$BIN/v_update_web_domain_stat $user $domain" + check_webstats=$(grep "$webstats" $VESTA/data/queue/webstats.pipe) + if [ -z "$check_webstats" ]; then + echo "$webstats" >> $VESTA/data/queue/webstats.pipe fi if [ ! -z "$STATS_USER" ]; then diff --git a/bin/v_update_sys_queue b/bin/v_update_sys_queue index e94403adc..832c31081 100755 --- a/bin/v_update_sys_queue +++ b/bin/v_update_sys_queue @@ -43,7 +43,7 @@ case $queue in restart) bash $VESTA/data/queue/restart.pipe; rm $VESTA/data/queue/restart.pipe; touch $VESTA/data/queue/restart.pipe;; - stats) bash $VESTA/data/queue/stats.pipe;; + webstats) bash $VESTA/data/queue/webstats.pipe;; backup) bash $VESTA/data/queue/backup.pipe;; disk) bash $VESTA/data/queue/disk.pipe;; traffic) bash $VESTA/data/queue/traffic.pipe;;