Skip to content

Commit 45b05ce

Browse files
author
Kristan Kenney
committed
Update log messages and quiet output on system actions
1 parent 6d3256e commit 45b05ce

File tree

92 files changed

+144
-113
lines changed

Some content is hidden

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

92 files changed

+144
-113
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $BIN/v-restart-cron
9494
check_result $? "Cron restart failed" >/dev/null
9595

9696
# Logging
97-
$BIN/v-log-action "system" "Info" "Updates" "Enabled automatic updates for Hestia Control Panel packages."
97+
$BIN/v-log-action "system" "Info" "Updates" "Automatic updates enabled."
9898
log_event "$OK" "$ARGUMENTS"
9999

100100
exit

‎bin/v-add-cron-reports‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $BIN/v-restart-cron
5656
check_result $? "Cron restart failed" >/dev/null
5757

5858
# Logging
59-
$BIN/v-log-action "$user" "Info" "Cron Jobs" "Enabled cron job notifications and reporting."
59+
$BIN/v-log-action "$user" "Info" "Cron Jobs" "Cron job notifications and reporting enabled."
6060
log_event "$OK" "$ARGUMENTS"
6161

6262
exit

‎bin/v-add-dns-record‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ priority=$6
2727
id=$7
2828
restart=$8
2929
ttl=$9
30+
quiet=${10}
3031

3132
if [ -z "$priority" ]; then
3233
priority=10
@@ -152,7 +153,9 @@ $BIN/v-restart-dns $restart
152153
check_result $? $E_RESTART 'dns failed to restart'
153154

154155
# Logging
155-
$BIN/v-log-action "$user" "Info" "DNS" "Added DNS record (Type: $rtype, Value: $record, Domain: $domain)."
156+
if [ "$quiet" != "yes" ]; then
157+
$BIN/v-log-action "$user" "Info" "DNS" "Added DNS record (Type: $rtype, Value: $record, Domain: $domain)."
158+
fi
156159
log_event "$OK" "$ARGUMENTS"
157160

158161
exit

‎bin/v-add-mail-account-forward‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ fi
8585
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD' "$fwd"
8686

8787
# Logging
88-
$BIN/v-log-action "$user" "Warning" "Mail" "Enabled mail forwarding on mail account $account@$domain (send to: $email_forward)."
88+
$BIN/v-log-action "$user" "Warning" "Mail" "Mail forwarding on mail account $account@$domain enabled (send to: $email_forward)."
8989
log_event "$OK" "$ARGUMENTS"
9090

9191
exit

‎bin/v-add-mail-account-fwd-only‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ add_object_key "mail/$domain" 'ACCOUNT' "$account" 'FWD_ONLY' 'MD5'
8383
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD_ONLY' "yes"
8484

8585
# Logging
86-
$BIN/v-log-action "$user" "Warning" "Mail" "Enabled forward-only flag on mail account $account@$domain."
86+
$BIN/v-log-action "$user" "Warning" "Mail" "Forward-only flag enabled on mail account $account@$domain."
8787
log_event "$OK" "$ARGUMENTS"
8888

8989
exit

‎bin/v-add-mail-domain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$dkim" = 'yes' ]; then
156156
p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n')
157157
record='_domainkey'
158158
policy="\"t=y; o=~;\""
159-
$BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
159+
$BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no' '' 'yes'
160160

161161
record='mail._domainkey'
162162
selector="\"v=DKIM1\; k=rsa\; p=$p\""
163-
$BIN/v-add-dns-record $user $domain $record TXT "$selector"
163+
$BIN/v-add-dns-record $user $domain $record TXT "$selector" '' '' 'yes' '' 'yes'
164164
fi
165165
fi
166166

‎bin/v-add-mail-domain-antispam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fi
6666
update_object_value 'mail' 'DOMAIN' "$domain" '$ANTISPAM' 'yes'
6767

6868
# Logging
69-
$BIN/v-log-action "$user" "Info" "Mail" "Enabled anti-spam protection for $domain."
69+
$BIN/v-log-action "$user" "Info" "Mail" "Anti-spam protection enabled (Domain: $domain)."
7070
log_event "$OK" "$ARGUMENTS"
7171

7272
exit

‎bin/v-add-mail-domain-antivirus‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fi
6666
update_object_value 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS' 'yes'
6767

6868
# Logging
69-
$BIN/v-log-action "$user" "Info" "Mail" "Enabled anti-virus scanning for $domain."
69+
$BIN/v-log-action "$user" "Info" "Mail" "Anti-virus scanning enabled (Domain: $domain)."
7070
log_event "$OK" "$ARGUMENTS"
7171

7272
exit

‎bin/v-add-mail-domain-catchall‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fi
6767
update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
6868

6969
# Logging
70-
$BIN/v-log-action "$user" "Warning" "Mail" "Enabled catch-all forwarding (Domain: $domain, Send to: $email)."
70+
$BIN/v-log-action "$user" "Warning" "Mail" "Catch-all forwarding enabled (Domain: $domain, Send to: $email)."
7171
log_event "$OK" "$ARGUMENTS"
7272

7373
exit

‎bin/v-add-mail-domain-dkim‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ if [ ! -z "$DNS_SYSTEM" ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
7878
p=$(cat $USER_DATA/mail/$domain.pub |grep -v ' KEY---' |tr -d '\n')
7979
record="_domainkey"
8080
policy="\"t=y\; o=~\;\""
81-
$BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
81+
$BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no' '' 'yes'
8282

8383
record="mail._domainkey"
8484
selector="\"v=DKIM1\; k=rsa\; p=$p\""
85-
$BIN/v-add-dns-record $user $domain $record TXT "$selector"
85+
$BIN/v-add-dns-record $user $domain $record TXT "$selector" '' '' 'yes' '' 'yes'
8686
fi
8787

8888

@@ -95,7 +95,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$DKIM' 'yes'
9595
increase_user_value "$user" '$U_MAIL_DKIM'
9696

9797
# Logging
98-
$BIN/v-log-action "$user" "Info" "Mail" "Enabled DKIM message signing for $domain."
98+
$BIN/v-log-action "$user" "Info" "Mail" "DKIM message signing enabled (Domain: $domain)."
9999
log_event "$OK" "$ARGUMENTS"
100100

101101
exit

0 commit comments

Comments
 (0)