Skip to content

Commit 7260399

Browse files
authored
Please do not use $BIN and $HESTIA/bin interchangeably; breaks override (hestiacp#3185)
* upgrade needs main for $BIN * Hestia defines $BIN; but forgot to use it. Breaks override, local.conf, and extenability; please be consistent. * Hestia defines $BIN; but forgot to use it. Breaks override, local.conf, and extenability; please be consistent. * Typo? Need support for 8.2? Previously this was formatted horizontally and was less obvious. Why concat in the middle of an array? Looks like a typo. Appended 8.2. ``` $this -> appInfo['php_support'] = array('5.6','7.0','7.1','7.2','7.3','7.4'.'8.0','8.1'); ``` Co-authored-by: Stephen J Carnam <steveorevo@gmail.com>
1 parent 559aece commit 7260399

Some content is hidden

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

47 files changed

+106
-104
lines changed

bin/v-add-cron-hestia-autoupdate

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if [ -z "$mode" ] || [ "$mode" = "apt" ]; then
5353
day='*'
5454
month='*'
5555
wday='*'
56-
command='sudo /usr/local/hestia/bin/v-update-sys-hestia-all'
56+
command="sudo $BIN/v-update-sys-hestia-all"
5757
fi
5858

5959
if [ "$mode" = "git" ]; then
@@ -62,7 +62,7 @@ if [ "$mode" = "git" ]; then
6262
day='*'
6363
month='*'
6464
wday='*'
65-
command='sudo /usr/local/hestia/bin/v-update-sys-hestia-git'
65+
command="sudo $BIN/v-update-sys-hestia-git"
6666
fi
6767

6868
# Concatenating cron string

bin/v-add-cron-letsencrypt-job

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ check_hestia_demo_mode
3030
#----------------------------------------------------------#
3131

3232
# Add cron job
33-
cmd="sudo $HESTIA/bin/v-update-sys-queue letsencrypt"
33+
cmd="sudo $BIN/v-update-sys-queue letsencrypt"
3434
check_cron=$(grep "$cmd" $HESTIA/data/users/admin/cron.conf 2> /dev/null)
3535
if [ -z "$check_cron" ] && [ -n "$CRON_SYSTEM" ]; then
3636
$BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd"

bin/v-add-cron-restart-job

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ check_hestia_demo_mode
3030
#----------------------------------------------------------#
3131

3232
# Add cron job
33-
cmd="sudo $HESTIA/bin/v-update-sys-queue restart"
33+
cmd="sudo $BIN/v-update-sys-queue restart"
3434
check_cron=$(grep "$cmd" $HESTIA/data/users/admin/cron.conf 2> /dev/null)
3535
if [ -z "$check_cron" ] && [ -n "$CRON_SYSTEM" ]; then
3636
$BIN/v-add-cron-job admin '*' '*' '*' '*' '*' "$cmd"

bin/v-add-letsencrypt-host

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ domain=$(hostname -f)
2929
if [ -z $domain ]; then
3030
domain=$HOSTNAME
3131
fi
32-
user="$($HESTIA/bin/v-search-domain-owner "$domain" web)"
32+
user="$($BIN/v-search-domain-owner "$domain" web)"
3333
[[ -z "$user" ]] && user="admin"
3434

3535
USER_DATA=$HESTIA/data/users/$user

bin/v-add-remote-dns-host

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ check_result $? "$HOST sync failed" "$E_CONNECT"
119119
#----------------------------------------------------------#
120120

121121
# Adding local dns-cluster cron job
122-
cmd="sudo $HESTIA/bin/v-update-sys-queue dns-cluster"
122+
cmd="sudo $BIN/v-update-sys-queue dns-cluster"
123123
check_cron=$(grep "$cmd" $HESTIA/data/users/admin/cron.conf 2> /dev/null)
124124
if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then
125125
$BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd"

bin/v-add-sys-ip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ fi
199199
increase_user_value "$user" '$IP_OWNED'
200200
if [ "$user" = 'admin' ]; then
201201
if [ "$ip_status" = 'shared' ]; then
202-
for hestia_user in $($HESTIA/bin/v-list-sys-users plain); do
202+
for hestia_user in $($BIN/v-list-sys-users plain); do
203203
increase_user_value "$hestia_user" '$IP_AVAIL'
204204
done
205205
else

bin/v-add-sys-quota

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ else
9090
fi
9191

9292
# Rebuilding user quota
93-
for user in $($HESTIA/bin/v-list-sys-users plain); do
93+
for user in $($BIN/v-list-sys-users plain); do
9494
$BIN/v-update-user-quota "$user"
9595
done
9696

bin/v-backup-users

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mysqlrepair --all-databases --check --auto-repair > /dev/null 2>&1
3131
if [ -z "$BACKUP_SYSTEM" ]; then
3232
exit
3333
fi
34-
for user in $($HESTIA/bin/v-list-sys-users plain); do
34+
for user in $($BIN/v-list-sys-users plain); do
3535
check_suspend=$(grep "SUSPENDED='no'" $HESTIA/data/users/$user/user.conf)
3636
log=$HESTIA/log/backup.log
3737
if [ ! -f "$HESTIA/data/users/$user/user.conf" ]; then

bin/v-change-domain-owner

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ if [ -n "$old_ip" ]; then
301301
fi
302302
# Send notification to panel
303303
if [ -n "$web_data" ] || [ -n "$dns_data" ] || [ -n "$mail_data" ]; then
304-
$HESTIA/bin/v-add-user-notification "$user" "$domain has been added to your account" ''
304+
$BIN/v-add-user-notification "$user" "$domain has been added to your account" ''
305305
fi
306306

307307
#----------------------------------------------------------#

bin/v-change-mail-domain-rate-limit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fi
6363

6464
# Update quota
6565
update_object_value "mail" 'DOMAIN' "$domain" '$RATE_LIMIT' "$rate"
66-
$HESTIA/bin/v-rebuild-mail-domain "$user" "$domain"
66+
$BIN/v-rebuild-mail-domain "$user" "$domain"
6767

6868
# Logging
6969
$BIN/v-log-action "$user" "Info" "Mail" "Mail domain rate limit has changed ($rate)"

0 commit comments

Comments
 (0)