Skip to content

Commit 445bd57

Browse files
author
Kristan Kenney
committed
Update path for webstats configuration file
1 parent 241d064 commit 445bd57

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

bin/v-change-web-domain-stats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ stats_dir="$HOMEDIR/$user/web/$domain/stats"
6161
rm -rf $stats_dir/*
6262

6363
# Deleting config
64-
rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
64+
rm -f $HOMEDIR/$user/conf/web/$domain/$STATS.conf
6565

6666
# Adding statistic config
6767
prepare_web_domain_values

bin/v-delete-web-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fi
8484
# Deleting web stats
8585
if [ ! -z "$STATS" ] && [ "$STATS" != 'no' ]; then
8686
sed -i "/ $domain$/d" $HESTIA/data/queue/webstats.pipe
87-
rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
87+
rm -f $HOMEDIR/$user/conf/web/$domain/$STATS.conf
8888
rm -f /etc/awstats/$STATS.$domain.conf
8989
fi
9090

bin/v-delete-web-domain-stats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ rm -rf $stats_dir/*
5454

5555
# Deleting config
5656
rm -f /etc/awstats/$STATS.$domain_idn.conf
57-
rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
57+
rm -f $HOMEDIR/$user/conf/web/$domain/$STATS.conf
5858

5959

6060
#----------------------------------------------------------#

bin/v-update-web-domain-stat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$STATS'
4545
get_domain_values 'web'
4646

4747
# Checking config
48-
config="$HOMEDIR/$user/conf/web/$STATS.$domain.conf"
48+
config="$HOMEDIR/$user/conf/web/$domain/$STATS.conf"
4949
if [ ! -e "$config" ]; then
5050
check_result $E_NOTEXISTS "$config doesn't exist"
5151
fi

func/rebuild.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,10 @@ rebuild_web_domain_conf() {
253253
-e "s|%home%|$HOMEDIR|g" \
254254
-e "s|%alias%|${aliases//,/ }|g" \
255255
-e "s|%alias_idn%|${aliases_idn//,/ }|g" \
256-
> $HOMEDIR/$user/conf/web/$STATS.$domain.conf
256+
> $HOMEDIR/$user/conf/web/$domain/$STATS.conf
257257
if [ "$STATS" == 'awstats' ]; then
258258
if [ ! -e "/etc/awstats/$STATS.$domain_idn.conf" ]; then
259-
ln -f -s $HOMEDIR/$user/conf/web/$STATS.$domain.conf \
259+
ln -f -s $HOMEDIR/$user/conf/web/$domain/$STATS.conf \
260260
/etc/awstats/$STATS.$domain_idn.conf
261261
fi
262262
fi

0 commit comments

Comments
 (0)