Fix domain/path naming in templates

Author: Kristan Kenney

func/domain.sh

@@ -604,6 +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|%root_domain%|$domain|g" \
             -e "s|%alias%|mail.$domain autodiscover.$domain|g" \
             -e "s|%alias_idn%|${aliases_idn//,/ }|g" \
             -e "s|%alias_string%|$alias_string|g" \

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

@@ -2,15 +2,15 @@
     ServerName %domain%
     ServerAlias %alias
     Alias / /var/lib/roundcube/
-    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
     #SuexecUserGroup %user% %group%
 
     SSLEngine on
     SSLVerifyClient none
-    SSLCertificateFile         %home%/%user%/conf/mail/%domain%/ssl/%domain%.crt
-    SSLCertificateKeyFile      %home%/%user%/conf/mail/%domain%/ssl/%domain%.key
+    SSLCertificateFile         %home%/%user%/conf/mail/%root_domain%/ssl/mail.%root_domain%.crt
+    SSLCertificateKeyFile      %home%/%user%/conf/mail/%root_domain%/ssl/mail.%root_domain%.key
 
-   IncludeOptional %home%/%user%/conf/web/%domain%/apache2.forcessl.conf*
+   IncludeOptional %home%/%user%/conf/web/%root_domain%/apache2.forcessl.conf*
 
     <Directory "/usr/share/tinymce/www/">
       Options Indexes MultiViews FollowSymLinks
@@ -48,6 +48,6 @@
         Deny from all
     </Directory>
 
-    IncludeOptional %home%/%user%/conf/mail/%domain%/%web_system%.ssl.conf_*
+    IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>

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

@@ -2,10 +2,10 @@
     ServerName %domain%
     ServerAlias %alias%
     Alias / /var/lib/roundcube/
-    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
     #SuexecUserGroup %user% %group%
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/apache2.forcessl.conf*
+    IncludeOptional %home%/%user%/conf/web/%root_domain%/apache2.forcessl.conf*
 
     <Directory "/usr/share/tinymce/www/">
       Options Indexes MultiViews FollowSymLinks
@@ -43,6 +43,6 @@
         Deny from all
     </Directory>
 
-    IncludeOptional %home%/%user%/conf/mail/%domain%/%web_system%.conf_*
+    IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*
 
 </VirtualHost>

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

@@ -17,7 +17,7 @@ server {
     }
 
     location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
+        alias   %home%/%user%/web/%root_domain%/document_errors/;
     }
 
     location @fallback {
@@ -30,6 +30,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/mail/%domain%/nginx.ssl.conf_*;
+    include %home%/%user%/conf/mail/%root_domain%/nginx.ssl.conf_*;
 }
 

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

@@ -13,7 +13,7 @@ server {
     }
 
     location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
+        alias   %home%/%user%/web/%root_domain%/document_errors/;
     }
 
     location ~ /(config|temp|logs) {
@@ -38,5 +38,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/mail/%domain%/nginx.conf_*;
+    include %home%/%user%/conf/mail/%root_domain%/nginx.conf_*;
 }