Skip to content

Commit ec5bf22

Browse files
committed
Merge branch 'pr/5'
2 parents 112a79f + 5fe591d commit ec5bf22

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

bin/v-backup-user

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,19 @@ email=$(grep CONTACT $HESTIA/data/users/admin/user.conf |cut -f 2 -d \')
5656

5757
# Checking load average
5858
la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
59-
i=0
59+
# i=0
6060
while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do
6161
echo -e "$(date "+%F %T") Load Average $la"
6262
sleep 60
63-
if [ "$i" -ge "15" ]; then
64-
la_error="LoadAverage $la is above threshold"
65-
echo "$la_error" |$SENDMAIL -s "$subj" $email $notify
66-
sed -i "/ $user /d" $HESTIA/data/queue/backup.pipe
67-
check_result $E_LA "$la_error"
68-
fi
63+
wait_for_backup_if_it_is_not_time_for_backup
64+
# if [ "$i" -ge "15" ]; then
65+
# la_error="LoadAverage $la is above threshold"
66+
# echo "$la_error" |$SENDMAIL -s "$subj" $email $notify
67+
# sed -i "/ $user /d" $HESTIA/data/queue/backup.pipe
68+
# check_result $E_LA "$la_error"
69+
# fi
6970
la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
70-
(( ++i))
71+
# (( ++i))
7172
done
7273

7374
if [ -z "$BACKUP_TEMP" ]; then

bin/v-list-web-domain-ssl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ source $HESTIA/func/main.sh
1919

2020
# JSON list function
2121
json_list() {
22+
issuer=$(echo "$issuer" |sed -e 's/"/\\"/g' -e "s/%quote%/'/g")
2223
echo '{'
2324
echo -e "\t\"$domain\": {"
2425
echo " \"CRT\": \"$crt\","

0 commit comments

Comments
 (0)