mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-21 05:44:07 -07:00
renamed stats.pipe to webstats.pipe
This commit is contained in:
parent
652754e62c
commit
16985e9d41
6 changed files with 10 additions and 11 deletions
|
@ -72,7 +72,7 @@ cat $WEBTPL/$type.tpl |\
|
||||||
|
|
||||||
# Schedule statistic processing
|
# Schedule statistic processing
|
||||||
echo "$BIN/v_update_web_domain_stat $user $domain" >> \
|
echo "$BIN/v_update_web_domain_stat $user $domain" >> \
|
||||||
$VESTA/data/queue/stats.pipe
|
$VESTA/data/queue/webstats.pipe
|
||||||
|
|
||||||
# Update config
|
# Update config
|
||||||
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"
|
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"
|
||||||
|
|
|
@ -85,9 +85,8 @@ if [ "$rv" -ne '0' ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Deleteing user pipes
|
# Deleteing user pipes
|
||||||
sed -i "/v_update_db_bases_disk $user$/d" $VESTA/data/queue/disk.pipe
|
sed -i "/ $user$/d" $VESTA/data/queue/disk.pipe
|
||||||
sed -i "/v_update_web_domains_traff $user$/d" $VESTA/data/queue/traffic.pipe
|
sed -i "/ $user$/d" $VESTA/data/queue/traffic.pipe
|
||||||
sed -i "/v_update_web_domain_stat $user /d" $VESTA/data/queue/stats.pipe
|
|
||||||
|
|
||||||
# Removing system user
|
# Removing system user
|
||||||
/usr/sbin/userdel -f $user
|
/usr/sbin/userdel -f $user
|
||||||
|
|
|
@ -83,7 +83,7 @@ fi
|
||||||
|
|
||||||
# Checking stats
|
# Checking stats
|
||||||
if [ ! -z "$STATS" ] && [ "$STATS" != 'no' ]; then
|
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
|
rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Deleting pipe command
|
# Deleting pipe command
|
||||||
sed -i "/ $domain$/d" $VESTA/data/queue/stats.pipe
|
sed -i "/ $domain$/d" $VESTA/data/queue/webstats.pipe
|
||||||
|
|
||||||
# Update config
|
# Update config
|
||||||
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' ''
|
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' ''
|
||||||
|
|
|
@ -136,10 +136,10 @@ for domain in $(shell_list) ; do
|
||||||
-e "s/%alias_idn%/${aliases_idn//,/ }/g" \
|
-e "s/%alias_idn%/${aliases_idn//,/ }/g" \
|
||||||
> $HOMEDIR/$user/conf/web/$STATS.$domain.conf
|
> $HOMEDIR/$user/conf/web/$STATS.$domain.conf
|
||||||
|
|
||||||
stats_string="$BIN/v_update_web_domain_stat $user $domain"
|
webstats="$BIN/v_update_web_domain_stat $user $domain"
|
||||||
check_stats_pipe=$(grep "$stats_string" $VESTA/data/queue/stats.pipe)
|
check_webstats=$(grep "$webstats" $VESTA/data/queue/webstats.pipe)
|
||||||
if [ -z "$check_stats_pipe" ]; then
|
if [ -z "$check_webstats" ]; then
|
||||||
echo "$stats_string" >> $VESTA/data/queue/stats.pipe
|
echo "$webstats" >> $VESTA/data/queue/webstats.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -z "$STATS_USER" ]; then
|
if [ ! -z "$STATS_USER" ]; then
|
||||||
|
|
|
@ -43,7 +43,7 @@ case $queue in
|
||||||
restart) bash $VESTA/data/queue/restart.pipe;
|
restart) bash $VESTA/data/queue/restart.pipe;
|
||||||
rm $VESTA/data/queue/restart.pipe;
|
rm $VESTA/data/queue/restart.pipe;
|
||||||
touch $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;;
|
backup) bash $VESTA/data/queue/backup.pipe;;
|
||||||
disk) bash $VESTA/data/queue/disk.pipe;;
|
disk) bash $VESTA/data/queue/disk.pipe;;
|
||||||
traffic) bash $VESTA/data/queue/traffic.pipe;;
|
traffic) bash $VESTA/data/queue/traffic.pipe;;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue