Browse Source

Update v-add-mail-domain-ssl to support SSL webmail

Kristan Kenney 7 years ago
parent
commit
e29db568fe
1 changed files with 9 additions and 7 deletions
  1. 9 7
      bin/v-add-mail-domain-ssl

+ 9 - 7
bin/v-add-mail-domain-ssl

@@ -65,20 +65,22 @@ is_web_domain_cert_valid
 # Call routine to add SSL configuration to mail domain
 # Call routine to add SSL configuration to mail domain
 add_mail_ssl_config
 add_mail_ssl_config
 
 
+# Add webmail configuration to mail domain
+if [ ! -z "$WEB_SYSTEM" ]; then
+    add_webmail_config "$WEB_SYSTEM" "default.stpl"
+fi
+if [ ! -z "$PROXY_SYSTEM" ]; then
+    add_webmail_config "$PROXY_SYSTEM" "default.stpl"
+fi
+
 # Increase value for domain
 # Increase value for domain
 increase_user_value "$user" '$U_MAIL_SSL'
 increase_user_value "$user" '$U_MAIL_SSL'
 
 
 # Set SSL as enabled in configuration
 # Set SSL as enabled in configuration
 update_object_value 'mail' 'DOMAIN' "$domain" '$SSL' "yes"
 update_object_value 'mail' 'DOMAIN' "$domain" '$SSL' "yes"
 
 
-# Refresh webmail configuration
-if [ ! -z "$WEB_SYSTEM" ]; then
-    add_ssl_webmail_config
 
 
-    # Restart web services for webmail changes to take effect
-    $BIN/v-restart-web $restart
-    $BIN/v-restart-proxy $restart
-fi
+
 
 
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 #                       Hestia                             #
 #                       Hestia                             #