Merge branch 'fix-scripts-output-0705'

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

@@ -87,4 +87,8 @@ check_result $? "Web restart failed" > /dev/null
 $BIN/v-restart-proxy
 check_result $? "Proxy restart failed" > /dev/null
 
+# Logging
+log_history "enabled automatic HTTP-to-HTTPS redirection for $domain"
+log_event "$OK" "$ARGUMENTS"
+
 exit

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

@@ -68,10 +68,6 @@ fi
 # Set forcessl flag to enabled
 update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HSTS' 'yes'
 
-# Logging
-log_history "Turned HTTP Strict Transport Security $status for $domain."
-log_event "$OK" "$ARGUMENTS"
-
 # Restart web server
 $BIN/v-restart-web
 check_result $? "Web restart failed" > /dev/null
@@ -80,4 +76,8 @@ check_result $? "Web restart failed" > /dev/null
 $BIN/v-restart-proxy
 check_result $? "Proxy restart failed" > /dev/null
 
+# Logging
+log_history "enabled HTTP Strict Transport Security (HSTS) for $domain"
+log_event "$OK" "$ARGUMENTS"
+
 exit

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

@@ -68,4 +68,8 @@ if [ ! -z "$restart" ]; then
     check_result $? "Proxy restart failed" >/dev/null
 fi
 
+# Logging
+log_history "disabled automatic HTTP-to-HTTPS redirection for $domain"
+log_event "$OK" "$ARGUMENTS"
+
 exit

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

@@ -67,4 +67,8 @@ if [ ! -z "$restart" ]; then
     check_result $? "Proxy restart failed" >/dev/null
 fi
 
+# Logging
+log_history "disabled HTTP Strict Transport Security (HSTS) for $domain"
+log_event "$OK" "$ARGUMENTS"
+
 exit