Skip to content

Commit 7a78e21

Browse files
jaapmarcusjaapmarcus
authored
Merge branch 'main' into feature/arm64-support
2 parents 70c22e9 + 8eb5219 commit 7a78e21

Some content is hidden

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

45 files changed

+1270
-788
lines changed

‎bin/v-add-sys-rainloop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,5 +171,5 @@ fi
171171

172172

173173

174-
log_history "Rouncube successfuly installed" '' 'admin'
174+
log_history "Rainloop successfuly installed" '' 'admin'
175175
log_event "$OK" "$ARGUMENTS"

‎bin/v-add-sys-roundcube‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,5 @@ fi
193193

194194

195195

196-
log_history "Rouncube successfuly installed" '' 'admin'
196+
log_history "Roundcube successfuly installed" '' 'admin'
197197
log_event "$OK" "$ARGUMENTS"

‎bin/v-change-sys-config-value‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ else
4848
sed -i "s|$key=.*|$key='$value'|g" $HESTIA/conf/hestia.conf
4949
fi
5050

51+
# Sort configuration file in alphabetical order on change
52+
sort $HESTIA/conf/hestia.conf -o /tmp/updconf
53+
mv $HESTIA/conf/hestia.conf $HESTIA/conf/hestia.conf.bak
54+
mv /tmp/updconf $HESTIA/conf/hestia.conf
55+
rm -f $HESTIA/conf/hestia.conf.bak
56+
5157
#----------------------------------------------------------#
5258
# Hestia #
5359
#----------------------------------------------------------#

‎bin/v-rebuild-all‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ restart=$2
2222
# Includes
2323
# shellcheck source=/usr/local/hestia/func/main.sh
2424
# shellcheck source=/usr/local/hestia/func/rebuild.sh
25+
# shellcheck source=/usr/local/hestia/func/syshealth.sh
2526
# shellcheck source=/usr/local/hestia/conf/hestia.conf
2627
source $HESTIA/func/main.sh
2728
source $HESTIA/func/rebuild.sh
29+
source $HESTIA/func/syshealth.sh
2830
source $HESTIA/conf/hestia.conf
2931

3032
# Export sbin

‎bin/v-rebuild-database‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ database=$2
2020
# shellcheck source=/usr/local/hestia/func/main.sh
2121
# shellcheck source=/usr/local/hestia/func/db.sh
2222
# shellcheck source=/usr/local/hestia/func/rebuild.sh
23+
# shellcheck source=/usr/local/hestia/func/syshealth.sh
2324
# shellcheck source=/usr/local/hestia/conf/hestia.conf
2425
source $HESTIA/func/main.sh
2526
source $HESTIA/func/db.sh
2627
source $HESTIA/func/rebuild.sh
28+
source $HESTIA/func/syshealth.sh
2729
source $HESTIA/conf/hestia.conf
2830

2931

‎bin/v-rebuild-databases‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ user=$1
1919
# shellcheck source=/usr/local/hestia/func/main.sh
2020
# shellcheck source=/usr/local/hestia/func/db.sh
2121
# shellcheck source=/usr/local/hestia/func/rebuild.sh
22+
# shellcheck source=/usr/local/hestia/func/syshealth.sh
2223
# shellcheck source=/usr/local/hestia/conf/hestia.conf
2324
source $HESTIA/func/main.sh
2425
source $HESTIA/func/db.sh
2526
source $HESTIA/func/rebuild.sh
27+
source $HESTIA/func/syshealth.sh
2628
source $HESTIA/conf/hestia.conf
2729

2830

‎bin/v-rebuild-dns-domain‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ update_serial=$4
2222
# shellcheck source=/usr/local/hestia/func/main.sh
2323
# shellcheck source=/usr/local/hestia/func/domain.sh
2424
# shellcheck source=/usr/local/hestia/func/rebuild.sh
25+
# shellcheck source=/usr/local/hestia/func/syshealth.sh
2526
# shellcheck source=/usr/local/hestia/conf/hestia.conf
2627
source $HESTIA/func/main.sh
2728
source $HESTIA/func/domain.sh
2829
source $HESTIA/func/rebuild.sh
30+
source $HESTIA/func/syshealth.sh
2931
source $HESTIA/conf/hestia.conf
3032

3133

‎bin/v-rebuild-dns-domains‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ update_serial=$3
2121
# shellcheck source=/usr/local/hestia/func/main.sh
2222
# shellcheck source=/usr/local/hestia/func/domain.sh
2323
# shellcheck source=/usr/local/hestia/func/rebuild.sh
24+
# shellcheck source=/usr/local/hestia/func/syshealth.sh
2425
# shellcheck source=/usr/local/hestia/conf/hestia.conf
2526
source $HESTIA/func/main.sh
2627
source $HESTIA/func/domain.sh
2728
source $HESTIA/func/rebuild.sh
29+
source $HESTIA/func/syshealth.sh
2830
source $HESTIA/conf/hestia.conf
2931

3032

‎bin/v-rebuild-mail-domain‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ domain=$2
1919
# Includes
2020
# shellcheck source=/usr/local/hestia/func/main.sh
2121
# shellcheck source=/usr/local/hestia/func/domain.sh
22-
# shellcheck source=/usr/local/hestia/func/rebuild.sh
2322
# shellcheck source=/usr/local/hestia/func/ip.sh
23+
# shellcheck source=/usr/local/hestia/func/rebuild.sh
24+
# shellcheck source=/usr/local/hestia/func/syshealth.sh
2425
# shellcheck source=/usr/local/hestia/conf/hestia.conf
2526
source $HESTIA/func/main.sh
2627
source $HESTIA/func/domain.sh
27-
source $HESTIA/func/rebuild.sh
2828
source $HESTIA/func/ip.sh
29+
source $HESTIA/func/rebuild.sh
30+
source $HESTIA/func/syshealth.sh
2931
source $HESTIA/conf/hestia.conf
3032

3133
# Define mail user

‎bin/v-rebuild-mail-domains‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ user=$1
1818
# Includes
1919
# shellcheck source=/usr/local/hestia/func/main.sh
2020
# shellcheck source=/usr/local/hestia/func/domain.sh
21-
# shellcheck source=/usr/local/hestia/func/rebuild.sh
2221
# shellcheck source=/usr/local/hestia/func/ip.sh
22+
# shellcheck source=/usr/local/hestia/func/rebuild.sh
23+
# shellcheck source=/usr/local/hestia/func/syshealth.sh
2324
# shellcheck source=/usr/local/hestia/conf/hestia.conf
2425
source $HESTIA/func/main.sh
2526
source $HESTIA/func/domain.sh
26-
source $HESTIA/func/rebuild.sh
2727
source $HESTIA/func/ip.sh
28+
source $HESTIA/func/rebuild.sh
29+
source $HESTIA/func/syshealth.sh
2830
source $HESTIA/conf/hestia.conf
2931

3032
# Define mail user

0 commit comments

Comments
 (0)