Skip to content

Commit 043b1fd

Browse files
ScIT-RaphaelScIT-Raphael
committed
Update $VESTA to $HESTIA var inside of binary scripts.
1 parent d21da77 commit 043b1fd

File tree

364 files changed

+1700
-1700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

364 files changed

+1700
-1700
lines changed

‎bin/v-acknowledge-user-notification‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ user=$1
1414
nid=$2
1515

1616
# Includes
17-
source $VESTA/func/main.sh
18-
source $VESTA/conf/vesta.conf
17+
source $HESTIA/func/main.sh
18+
source $HESTIA/conf/hestia.conf
1919

2020

2121
#----------------------------------------------------------#
@@ -48,7 +48,7 @@ fi
4848

4949

5050
#----------------------------------------------------------#
51-
# Vesta #
51+
# Hestia #
5252
#----------------------------------------------------------#
5353

5454
# Updating notification counter

‎bin/v-activate-vesta-license‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ license=$2
1717
source /etc/profile
1818

1919
# Includes
20-
source $VESTA/func/main.sh
21-
source $VESTA/conf/vesta.conf
20+
source $HESTIA/func/main.sh
21+
source $HESTIA/conf/hestia.conf
2222

2323

2424
#----------------------------------------------------------#
@@ -46,14 +46,14 @@ fi
4646

4747

4848
#----------------------------------------------------------#
49-
# Vesta #
49+
# Hestia #
5050
#----------------------------------------------------------#
5151

52-
# Updating vesta.conf
53-
if [ -z "$(grep "${module}_KEY" $VESTA/conf/vesta.conf)" ]; then
54-
echo "${module}_KEY='$license'" >> $VESTA/conf/vesta.conf
52+
# Updating hestia.conf
53+
if [ -z "$(grep "${module}_KEY" $HESTIA/conf/hestia.conf)" ]; then
54+
echo "${module}_KEY='$license'" >> $HESTIA/conf/hestia.conf
5555
else
56-
sed -i "s/${module}_KEY=.*/${module}_KEY='$license'/g" $VESTA/conf/vesta.conf
56+
sed -i "s/${module}_KEY=.*/${module}_KEY='$license'/g" $HESTIA/conf/hestia.conf
5757
fi
5858

5959
# Activating sftpjail

‎bin/v-add-backup-host‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ path=${5-/backup}
1818
port=$6
1919

2020
# Includes
21-
source $VESTA/func/main.sh
22-
source $VESTA/conf/vesta.conf
21+
source $HESTIA/func/main.sh
22+
source $HESTIA/conf/hestia.conf
2323

2424
# Defining ftp command function
2525
ftpc() {
@@ -174,25 +174,25 @@ if [ $type != 'local' ]; then
174174
date=$(echo "$time_n_date" |cut -f 2 -d \ )
175175
str="HOST='$host'\nUSERNAME='$user'\nPASSWORD='$password'"
176176
str="$str\nBPATH='$path'\nPORT='$port'\nTIME='$time'\nDATE='$date'"
177-
echo -e "$str" > $VESTA/conf/$type.backup.conf
178-
chmod 660 $VESTA/conf/$type.backup.conf
177+
echo -e "$str" > $HESTIA/conf/$type.backup.conf
178+
chmod 660 $HESTIA/conf/$type.backup.conf
179179
fi
180180

181181

182182
#----------------------------------------------------------#
183-
# Vesta #
183+
# Hestia #
184184
#----------------------------------------------------------#
185185

186-
# Update vesta.conf
187-
if [ -z "$(grep BACKUP_SYSTEM $VESTA/conf/vesta.conf)" ]; then
188-
echo "BACKUP_SYSTEM='$type'" >> $VESTA/conf/vesta.conf
186+
# Update hestia.conf
187+
if [ -z "$(grep BACKUP_SYSTEM $HESTIA/conf/hestia.conf)" ]; then
188+
echo "BACKUP_SYSTEM='$type'" >> $HESTIA/conf/hestia.conf
189189
else
190190
bckp=$(echo "$BACKUP_SYSTEM,$type" |\
191191
sed "s/,/\n/g"|\
192192
sort -r -u |\
193193
sed "/^$/d"|\
194194
sed ':a;N;$!ba;s/\n/,/g')
195-
sed -i "s/BACKUP_SYSTEM=.*/BACKUP_SYSTEM='$bckp'/g" $VESTA/conf/vesta.conf
195+
sed -i "s/BACKUP_SYSTEM=.*/BACKUP_SYSTEM='$bckp'/g" $HESTIA/conf/hestia.conf
196196
fi
197197

198198
# Logging

‎bin/v-add-cron-hestia-autoupdate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ sync_cron_jobs
6565

6666

6767
#----------------------------------------------------------#
68-
# Vesta #
68+
# Hestia #
6969
#----------------------------------------------------------#
7070

7171
# Increasing cron value

‎bin/v-add-cron-job‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ job=$8
2222
restart=$9
2323

2424
# Includes
25-
source $VESTA/func/main.sh
26-
source $VESTA/conf/vesta.conf
25+
source $HESTIA/func/main.sh
26+
source $HESTIA/conf/hestia.conf
2727

2828
HIDE=7
2929

@@ -57,10 +57,10 @@ str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month' WDAY='$wday'"
5757
str="$str CMD='$command' SUSPENDED='no' TIME='$time' DATE='$date'"
5858

5959
# Adding to crontab
60-
echo "$str" >> $VESTA/data/users/$user/cron.conf
60+
echo "$str" >> $HESTIA/data/users/$user/cron.conf
6161

6262
# Changing permissions
63-
chmod 660 $VESTA/data/users/$user/cron.conf
63+
chmod 660 $HESTIA/data/users/$user/cron.conf
6464

6565
# Sort jobs by id number
6666
sort_cron_jobs
@@ -70,7 +70,7 @@ sync_cron_jobs
7070

7171

7272
#----------------------------------------------------------#
73-
# Vesta #
73+
# Hestia #
7474
#----------------------------------------------------------#
7575

7676
# Increasing cron value

‎bin/v-add-cron-letsencrypt-job‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# Includes
1313
source $HESTIA/func/main.sh
14-
source $HESTIA/conf/vesta.conf
14+
source $HESTIA/conf/hestia.conf
1515

1616

1717
#----------------------------------------------------------#

‎bin/v-add-cron-reports‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
user=$1
1515

1616
# Includes
17-
source $VESTA/func/main.sh
18-
source $VESTA/conf/vesta.conf
17+
source $HESTIA/func/main.sh
18+
source $HESTIA/conf/hestia.conf
1919

2020

2121
#----------------------------------------------------------#
@@ -41,7 +41,7 @@ sync_cron_jobs
4141

4242

4343
#----------------------------------------------------------#
44-
# Vesta #
44+
# Hestia #
4545
#----------------------------------------------------------#
4646

4747
# Restart crond

‎bin/v-add-database‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ charset=${7-UTF8}
2626
charset=$(echo "$charset" |tr '[:lower:]' '[:upper:]')
2727

2828
# Includes
29-
source $VESTA/func/main.sh
30-
source $VESTA/func/db.sh
31-
source $VESTA/conf/vesta.conf
29+
source $HESTIA/func/main.sh
30+
source $HESTIA/func/db.sh
31+
source $HESTIA/conf/hestia.conf
3232

3333

3434
#----------------------------------------------------------#
@@ -63,7 +63,7 @@ esac
6363

6464

6565
#----------------------------------------------------------#
66-
# Vesta #
66+
# Hestia #
6767
#----------------------------------------------------------#
6868

6969
# Generating timestamp

‎bin/v-add-database-host‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ charsets=${7-UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8}
2323
template=${8-template1}
2424

2525
# Includes
26-
source $VESTA/func/main.sh
27-
source $VESTA/func/db.sh
28-
source $VESTA/conf/vesta.conf
26+
source $HESTIA/func/main.sh
27+
source $HESTIA/func/db.sh
28+
source $HESTIA/conf/hestia.conf
2929

3030
is_mysql_host_alive() {
3131
mycnf=$(mktemp)
@@ -94,23 +94,23 @@ esac
9494

9595

9696
#----------------------------------------------------------#
97-
# Vesta #
97+
# Hestia #
9898
#----------------------------------------------------------#
9999

100100
# Adding host to conf
101-
echo "$str" >> $VESTA/conf/$type.conf
102-
chmod 660 $VESTA/conf/$type.conf
101+
echo "$str" >> $HESTIA/conf/$type.conf
102+
chmod 660 $HESTIA/conf/$type.conf
103103

104-
# Updating vesta.conf
105-
if [ -z "$(grep DB_SYSTEM $VESTA/conf/vesta.conf)" ]; then
106-
echo "DB_SYSTEM='$type'" >> $VESTA/conf/vesta.conf
104+
# Updating hestia.conf
105+
if [ -z "$(grep DB_SYSTEM $HESTIA/conf/hestia.conf)" ]; then
106+
echo "DB_SYSTEM='$type'" >> $HESTIA/conf/hestia.conf
107107
else
108108
db=$(echo "$DB_SYSTEM,$type" |\
109109
sed "s/,/\n/g"|\
110110
sort -r -u |\
111111
sed "/^$/d"|\
112112
sed ':a;N;$!ba;s/\n/,/g')
113-
sed -i "s/DB_SYSTEM=.*/DB_SYSTEM='$db'/g" $VESTA/conf/vesta.conf
113+
sed -i "s/DB_SYSTEM=.*/DB_SYSTEM='$db'/g" $HESTIA/conf/hestia.conf
114114
fi
115115

116116
# Logging

‎bin/v-add-dns-domain‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ ns8=${11}
2828
restart=${12}
2929

3030
# Includes
31-
source $VESTA/func/main.sh
32-
source $VESTA/func/domain.sh
33-
source $VESTA/conf/vesta.conf
31+
source $HESTIA/func/main.sh
32+
source $HESTIA/func/domain.sh
33+
source $HESTIA/conf/hestia.conf
3434

3535
# Additional argument formatting
3636
format_domain
@@ -184,12 +184,12 @@ fi
184184
# Updating dns-cluster queue
185185
if [ ! -z "$DNS_CLUSTER" ]; then
186186
cmd="$BIN/v-add-remote-dns-domain $user $domain yes"
187-
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
187+
echo "$cmd" >> $HESTIA/data/queue/dns-cluster.pipe
188188
fi
189189

190190

191191
#----------------------------------------------------------#
192-
# Vesta #
192+
# Hestia #
193193
#----------------------------------------------------------#
194194

195195
# Increasing domain value

0 commit comments

Comments
 (0)