Set proper aliases for mail ssl.

func/domain.sh

@@ -604,7 +604,7 @@ add_webmail_config() {
         sed -e "s|%ip%|$local_ip|g" \
             -e "s|%domain%|$WEBMAIL_ALIAS.$domain|g" \
             -e "s|%domain_idn%|$domain_idn|g" \
-            -e "s|%alias%|${aliases//,/ }|g" \
+            -e "s|%alias%|mail.$domain autodiscover.$domain|g" \
             -e "s|%alias_idn%|${aliases_idn//,/ }|g" \
             -e "s|%alias_string%|$alias_string|g" \
             -e "s|%email%|info@$domain|g" \

install/deb/templates/mail/apache2/default.stpl

@@ -1,5 +1,6 @@
 <VirtualHost %ip%:%web_ssl_port%>
     ServerName %domain%
+    ServerAlias %alias
     Alias / /var/lib/roundcube/
     Alias /error/ %home%/%user%/web/%domain%/document_errors/
     #SuexecUserGroup %user% %group%

install/deb/templates/mail/apache2/default.tpl

@@ -1,5 +1,6 @@
 <VirtualHost %ip%:%web_port%>
     ServerName %domain%
+    ServerAlias %alias%
     Alias / /var/lib/roundcube/
     Alias /error/ %home%/%user%/web/%domain%/document_errors/
     #SuexecUserGroup %user% %group%

install/deb/templates/mail/nginx/default.stpl

@@ -1,6 +1,6 @@
 server {
     listen      %ip%:%proxy_ssl_port% ssl http2;
-    server_name %domain%;
+    server_name %domain% %alias%;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;

install/deb/templates/mail/nginx/default.tpl

@@ -1,6 +1,6 @@
 server {
     listen      %ip%:%proxy_port%;
-    server_name %domain%;
+    server_name %domain% %alias%;
         
     include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*;
     location / {