Merge pull request #1936 from jaapmarcus/fix/1930-additional-fix-apache2

Bug in apache2 template / wrong template selected

bin/v-add-mail-domain-webmail

@@ -134,7 +134,7 @@ else
     else
         WEBMAIL_TEMPLATE="disabled"
         if [ ! -z "$PROXY_SYSTEM" ]; then
-            PROXY_TEMPLATE="disabled"
+            PROXY_TEMPLATE="default_disabled"
         fi
     fi
     

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

@@ -1,22 +1,21 @@
 <VirtualHost %ip%:%web_ssl_port%>
-    ServerName %domain_idn%
-    ServerAlias %alias%
-    Alias / /var/lib/roundcube/
-    Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
-    #SuexecUserGroup %user% %group%
-    
-    SSLEngine on
-    SSLVerifyClient none
-    SSLCertificateFile         %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt
-    SSLCertificateKeyFile      %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.key
-    
-    <Directory /var/www/html>
-        Options +FollowSymLinks
-        AllowOverride All
-        order allow,deny
-        allow from all
-    </Directory>
+ServerName %domain_idn%
+ServerAlias %alias_idn%
+Alias / /var/www/html/
+Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
+#SuexecUserGroup %user% %group%
 
-    IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*
+SSLEngine on
+SSLVerifyClient none
+SSLCertificateFile         %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt
+SSLCertificateKeyFile      %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.key
+    
+<Directory /var/www/html>
+    Options +FollowSymLinks
+    AllowOverride All
+    order allow,deny
+    allow from all
+</Directory>
 
+IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*
 </VirtualHost>

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

@@ -1,17 +1,18 @@
 <VirtualHost %ip%:%web_port%>
     ServerName %domain_idn%
-    ServerAlias %alias%
-    Alias / /var/lib/roundcube/
+    ServerAlias %alias_idn%
+    Alias / /var/www/html
     Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
     #SuexecUserGroup %user% %group%
-    
-    SSLEngine on
-    SSLVerifyClient none
-    
+        
+    IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf*
+
     <Directory /var/www/html>
         Options +FollowSymLinks
         AllowOverride All
         order allow,deny
         allow from all
     </Directory>
+
+    IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*
 </VirtualHost>