Skip to content

Commit 2373f75

Browse files
author
Kristan Kenney
committed
Merge branch 'fix/restart-handling' into main
2 parents b2fa004 + c1fcee6 commit 2373f75

12 files changed

+29
-37
lines changed

‎bin/v-add-mail-domain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ fi
154154
# Add webmail configuration to mail domain
155155
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
156156
if [ ! -z "$IMAP_SYSTEM" ]; then
157-
$BIN/v-add-sys-webmail $user $domain '' '' ''
157+
$BIN/v-add-sys-webmail $user $domain '' 'no'
158158
fi
159159
fi
160160

‎bin/v-add-sys-webmail‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ else
9494

9595
if [ "$dns_domain" = "$domain" ]; then
9696
if [ -z "$webmail_record" ]; then
97-
$BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip
97+
$BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip '' '' $restart
9898
else
99-
$BIN/v-delete-dns-record $user $domain $webmail_record
100-
$BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip
99+
$BIN/v-delete-dns-record $user $domain $webmail_record $restart
100+
$BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip '' '' $restart
101101
fi
102102
fi
103103
fi

‎bin/v-add-web-domain-ssl-force‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ fi
8585
update_object_value 'web' 'DOMAIN' "$domain" '$SSL_FORCE' 'yes'
8686

8787
# Restart web server
88-
$BIN/v-restart-web
88+
$BIN/v-restart-web $restart
8989
check_result $? "Web restart failed" > /dev/null
9090

9191
# Restart proxy
92-
$BIN/v-restart-proxy
92+
$BIN/v-restart-proxy $restart
9393
check_result $? "Proxy restart failed" > /dev/null
9494

9595
# Logging

‎bin/v-add-web-domain-ssl-hsts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ fi
7171
update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HSTS' 'yes'
7272

7373
# Restart web server
74-
$BIN/v-restart-web
74+
$BIN/v-restart-web $restart
7575
check_result $? "Web restart failed" > /dev/null
7676

7777
# Restart proxy
78-
$BIN/v-restart-proxy
78+
$BIN/v-restart-proxy $restart
7979
check_result $? "Proxy restart failed" > /dev/null
8080

8181
# Logging

‎bin/v-change-dns-domain-tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ if [ "$template" = "office365" ]; then
123123
if [ "$?" -eq 0 ]; then
124124
record='@'
125125
formatted_domain=$(echo "$domain" | sed 's/\./-/g')
126-
$BIN/v-add-dns-record $user $domain $record MX "${formatted_domain}.mail.protection.outlook.com." '0'
126+
$BIN/v-add-dns-record $user $domain $record MX "${formatted_domain}.mail.protection.outlook.com." '0' '' $restart
127127
fi
128128
fi
129129

‎bin/v-delete-sys-webmail‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if [ ! -z "$WEBMAIL_ALIAS" ]; then
5858

5959
if [ "$dns_domain" = "$domain" ]; then
6060
if [ ! -z "$webmail_record" ]; then
61-
$BIN/v-delete-dns-record $user $domain $webmail_record
61+
$BIN/v-delete-dns-record $user $domain $webmail_record $restart
6262
fi
6363
fi
6464
fi

‎bin/v-delete-web-domain-ssl-force‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,11 @@ fi
6161
update_object_value 'web' 'DOMAIN' "$domain" '$SSL_FORCE' 'no'
6262

6363
# Restart services if requested
64-
if [ ! -z "$restart" ]; then
65-
$BIN/v-restart-web
66-
check_result $? "Web restart failed" >/dev/null
64+
$BIN/v-restart-web $restart
65+
check_result $? "Web restart failed" >/dev/null
6766

68-
$BIN/v-restart-proxy
69-
check_result $? "Proxy restart failed" >/dev/null
70-
fi
67+
$BIN/v-restart-proxy $restart
68+
check_result $? "Proxy restart failed" >/dev/null
7169

7270
# Logging
7371
log_history "disabled automatic HTTP-to-HTTPS redirection for $domain"

‎bin/v-delete-web-domain-ssl-hsts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@ rm -f $hstsconf
6060
update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HSTS' 'no'
6161

6262
# Restart services if requested
63-
if [ ! -z "$restart" ]; then
64-
$BIN/v-restart-web
65-
check_result $? "Web restart failed" >/dev/null
63+
$BIN/v-restart-web $restart
64+
check_result $? "Web restart failed" >/dev/null
6665

67-
$BIN/v-restart-proxy
68-
check_result $? "Proxy restart failed" >/dev/null
69-
fi
66+
$BIN/v-restart-proxy $restart
67+
check_result $? "Proxy restart failed" >/dev/null
7068

7169
# Logging
7270
log_history "disabled HTTP Strict Transport Security (HSTS) for $domain"

‎bin/v-rebuild-mail-domain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ rebuild_mail_domain_conf
5858
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
5959
if [ ! -z "$IMAP_SYSTEM" ]; then
6060
WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
61-
$BIN/v-delete-sys-webmail $user $domain '' 'yes'
62-
$BIN/v-add-sys-webmail $user $domain $WEBMAIL '' 'yes'
61+
$BIN/v-delete-sys-webmail $user $domain '' $restart
62+
$BIN/v-add-sys-webmail $user $domain $WEBMAIL '' $restart
6363
fi
6464
fi
6565

‎bin/v-rebuild-mail-domains‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
6262
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
6363
if [ ! -z "$IMAP_SYSTEM" ]; then
6464
WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
65-
$BIN/v-delete-sys-webmail $user $domain '' 'yes'
66-
$BIN/v-add-sys-webmail $user $domain $WEBMAIL '' 'yes'
65+
$BIN/v-delete-sys-webmail $user $domain $restart
66+
$BIN/v-add-sys-webmail $user $domain $WEBMAIL $restart
6767
if [ $? -ne 0 ]; then
68-
$BIN/v-add-sys-webmail $user $domain '' '' 'yes'
68+
$BIN/v-add-sys-webmail $user $domain '' $restart
6969
fi
7070
fi
7171
fi

0 commit comments

Comments
 (0)