Fix issues with v-add-sys-webmail / Webmail not working

bin/v-add-sys-webmail

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$(idn -t --quiet -a "$2")
+domain=$2
 webmail=$3
 restart="$4"
 quiet=$5

bin/v-delete-sys-webmail

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$(idn -t --quiet -a "$2")
+domain=$2
 restart="$3"
 quiet=$4
 

func/domain.sh

@@ -743,15 +743,17 @@ add_webmail_config() {
     override_alias="";
     if [ "$WEBMAIL_ALIAS" != "mail" ]; then
         override_alias="mail.$domain"
+        override_alias_idn="mail.$domain_idn"
+        
     fi
     
     cat $MAILTPL/$1/$2 | \
         sed -e "s|%ip%|$local_ip|g" \
             -e "s|%domain%|$WEBMAIL_ALIAS.$domain|g" \
-            -e "s|%domain_idn%|$domain_idn|g" \
+            -e "s|%domain_idn%|$WEBMAIL_ALIAS.$domain_idn|g" \
             -e "s|%root_domain%|$domain|g" \
             -e "s|%alias%|$override_alias|g" \
-            -e "s|%alias_idn%|${aliases_idn//,/ }|g" \
+            -e "s|%alias_idn%|$override_alias_idn|g" \
             -e "s|%alias_string%|$alias_string|g" \
             -e "s|%email%|info@$domain|g" \
             -e "s|%web_system%|$WEB_SYSTEM|g" \

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 <VirtualHost %ip%:%web_port%>
-    ServerName %domain%
-    ServerAlias %alias%
+    ServerName %domain_idn%
+    ServerAlias %alias_idn%
     Alias / /var/lib/rainloop/
     Alias /error/ %home%/%user%/web/%root_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% %alias%;
+    server_name %domain_idn% %alias_idn%;
     root        /var/lib/roundcube;
     index       index.php index.html index.htm;
     access_log /var/log/nginx/domains/%domain%.log combined;

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

@@ -1,6 +1,6 @@
 server {
     listen      %ip%:%proxy_port%;
-    server_name %domain% %alias%;
+    server_name %domain_idn% %alias_idn%;
     root        /var/lib/roundcube;
     index       index.php index.html index.htm;
     access_log /var/log/nginx/domains/%domain%.log combined;

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

@@ -1,6 +1,6 @@
 server {
 listen      %ip%:%proxy_ssl_port% ssl http2;
-server_name %domain% %alias%;
+server_name %domain_idn% %alias_idn%;
 root        /var/lib/rainloop;
 index       index.php index.html index.htm;
 access_log /var/log/nginx/domains/%domain%.log combined;

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

@@ -1,6 +1,6 @@
 server {
 listen      %ip%:%proxy_port%;
-server_name %domain% %alias%;
+server_name %domain_idn% %alias_idn%;
 root        /var/lib/rainloop;
 index       index.php index.html index.htm;
 access_log /var/log/nginx/domains/%domain%.log combined;

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

@@ -1,6 +1,6 @@
 server {
 listen      %ip%:%web_ssl_port% ssl http2;
-server_name %domain% %alias%;
+server_name %domain_idn% %alias_idn%;
 root        /var/lib/rainloop;
 index       index.php index.html index.htm;
 access_log /var/log/nginx/domains/%domain%.log combined;

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

@@ -1,6 +1,6 @@
 server {
 listen      %ip%:%web_port%;
-server_name %domain% %alias%;
+server_name %domain_idn% %alias_idn%;
 root        /var/lib/rainloop;
 index       index.php index.html index.htm;
 access_log /var/log/nginx/domains/%domain%.log combined;

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

@@ -1,6 +1,6 @@
 server {
     listen      %ip%:%web_ssl_port% ssl http2;
-    server_name %domain% %alias%;
+    server_name %domain_idn% %alias_idn%;
     root        /var/lib/roundcube;
     index       index.php index.html index.htm;
     access_log /var/log/nginx/domains/%domain%.log combined;

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

@@ -1,6 +1,6 @@
 server {
     listen      %ip%:%web_port%;
-    server_name %domain% %alias%;
+    server_name %domain_idn% %alias_idn%;
     root        /var/lib/roundcube;
     index       index.php index.html index.htm;
     access_log /var/log/nginx/domains/%domain%.log combined;