Skip to content

Commit e41355d

Browse files
committed
Change $VESTA to $HESTIA after patch from source.
1 parent f1f4023 commit e41355d

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

bin/v-backup-users

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ fi
2828
for user in $(grep '@' /etc/passwd |cut -f1 -d:); do
2929
check_suspend=$(grep "SUSPENDED='no'" $HESTIA/data/users/$user/user.conf)
3030
log=$HESTIA/log/backup.log
31-
if [ ! -f "$VESTA/data/users/$user/user.conf" ]; then
31+
if [ ! -f "$HESTIA/data/users/$user/user.conf" ]; then
3232
continue;
3333
fi
3434
wait_for_backup_if_it_is_not_time_for_backup
35-
check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf)
36-
log=$VESTA/log/backup.log
35+
check_suspend=$(grep "SUSPENDED='no'" $HESTIA/data/users/$user/user.conf)
36+
log=$HESTIA/log/backup.log
3737
if [ ! -z "$check_suspend" ]; then
3838
echo -e "================================" >> $log
3939
echo -e "$user" >> $log

bin/v-list-users

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ json_list() {
1818
i=1
1919
while read USER; do
2020
source $HESTIA/data/users/$USER/user.conf
21-
if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
21+
if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
2222
continue;
2323
fi
2424
if [ $i -gt 1 ]; then
2525
echo ","
2626
fi
27-
source $VESTA/data/users/$USER/user.conf
27+
source $HESTIA/data/users/$USER/user.conf
2828
echo -n ' "'$USER'": {
2929
"FNAME": "'$FNAME'",
3030
"LNAME": "'$LNAME'",
@@ -91,10 +91,10 @@ shell_list() {
9191
echo "---- --- --- --- --- -- ---- -- ---- ----"
9292
while read USER; do
9393
source $HESTIA/data/users/$USER/user.conf
94-
if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
94+
if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
9595
continue;
9696
fi
97-
source $VESTA/data/users/$USER/user.conf
97+
source $HESTIA/data/users/$USER/user.conf
9898
echo -n "$USER $PACKAGE $U_WEB_DOMAINS $U_DNS_DOMAINS $U_MAIL_DOMAINS"
9999
echo " $U_DATABASES $U_DISK $U_BANDWIDTH $SUSPENDED $DATE"
100100
done < <(grep '@' /etc/passwd |cut -f1 -d:)
@@ -104,10 +104,10 @@ shell_list() {
104104
plain_list() {
105105
while read USER; do
106106
source $HESTIA/data/users/$USER/user.conf
107-
if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
107+
if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
108108
continue;
109109
fi
110-
source $VESTA/data/users/$USER/user.conf
110+
source $HESTIA/data/users/$USER/user.conf
111111
echo -ne "$USER\t$FNAME\t$LNAME\t$PACKAGE\t$WEB_TEMPLATE\t"
112112
echo -ne "$BACKEND_TEMPLATE\t$PROXY_TEMPLATE\t$DNS_TEMPLATE\t"
113113
echo -ne "$WEB_DOMAINS\t$WEB_ALIASES\t$DNS_DOMAINS\t$DNS_RECORDS\t"
@@ -140,10 +140,10 @@ csv_list() {
140140
echo "U_CRON_JOBS,U_BACKUPS,LANGUAGE,TIME,DATE"
141141
while read USER; do
142142
source $HESTIA/data/users/$USER/user.conf
143-
if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
143+
if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
144144
continue;
145145
fi
146-
source $VESTA/data/users/$USER/user.conf
146+
source $HESTIA/data/users/$USER/user.conf
147147
echo -n "$USER,\"$FNAME\",\"$LNAME\",$PACKAGE,$WEB_TEMPLATE,"
148148
echo -n "$BACKEND_TEMPLATE,$PROXY_TEMPLATE,$DNS_TEMPLATE,"
149149
echo -n "$WEB_DOMAINS,$WEB_ALIASES,$DNS_DOMAINS,$DNS_RECORDS,"
@@ -165,11 +165,11 @@ raw_list() {
165165
while read USER; do
166166
echo $HESTIA/data/users/$USER/user.conf
167167
cat $HESTIA/data/users/$USER/user.conf
168-
if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then
168+
if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
169169
continue;
170170
fi
171-
echo $VESTA/data/users/$USER/user.conf
172-
cat $VESTA/data/users/$USER/user.conf
171+
echo $HESTIA/data/users/$USER/user.conf
172+
cat $HESTIA/data/users/$USER/user.conf
173173
done < <(grep '@' /etc/passwd |cut -f1 -d:)
174174
}
175175

bin/v-update-user-stats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ TOTAL_USERS=0
6868
# Updating user stats
6969
for user in $user_list; do
7070
USER_DATA=$HESTIA/data/users/$user
71-
if [ ! -f "$VESTA/data/users/$user/user.conf" ]; then
71+
if [ ! -f "$HESTIA/data/users/$user/user.conf" ]; then
7272
continue;
7373
fi
74-
USER_DATA=$VESTA/data/users/$user
74+
USER_DATA=$HESTIA/data/users/$user
7575
source $USER_DATA/user.conf
7676
next_month=$(date +'%m/01/%y' -d '+ 1 month')
7777
DATE=$(date -d "$next_month -1day" +%F)

0 commit comments

Comments
 (0)