Fix bug in disabled templates

Author: jaapmarcus

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

@@ -1,21 +1,12 @@
 <VirtualHost %ip%:%web_ssl_port%>
 ServerName %domain_idn%
 ServerAlias %alias_idn%
-Alias / /var/www/html/
-Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
-#SuexecUserGroup %user% %group%
+DocumentRoot /var/www/html/
+Alias /error/ /var/www/document_errors/
 
 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,18 +1,7 @@
 <VirtualHost %ip%:%web_port%>
     ServerName %domain_idn%
     ServerAlias %alias_idn%
-    Alias / /var/www/html
-    Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
+    DocumentRoot /var/www/html/
+    Alias /error/ /var/www/document_errors/
     #SuexecUserGroup %user% %group%
-        
-    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>

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

@@ -1,33 +1,21 @@
 server {
-    listen      %ip%:%proxy_ssl_port% ssl http2;
-    server_name %domain_idn% %alias_idn%;
-    root        /var/www/html;
+    listen       %ip%:%proxy_ssl_port% ssl http2;
+    server_name  %domain_idn% %alias_idn%;
     index       index.php index.html index.htm;
     access_log /var/log/nginx/domains/%domain%.log combined;
     error_log  /var/log/nginx/domains/%domain%.error.log error;
-
+    
     ssl_certificate     %ssl_pem%;
     ssl_certificate_key %ssl_key%;
     ssl_stapling on;
     ssl_stapling_verify on;
-
+    
     location ~ /\.(?!well-known\/) {
         deny all;
         return 404;
     }
-
+    
     location / {
-        try_files $uri $uri/ =404;
-        alias /var/www/html;
+        proxy_pass  http://%ip%:%web_port%;
     }
-
-    location /error/ {
-        alias /var/www/document_errors/;
-    }
-	
-    location @fallback {
-        proxy_pass https://%ip%:%web_ssl_port%;
-    }
-
-    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
-}
+}

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

@@ -1,31 +1,18 @@
 server {
-    listen      %ip%:%proxy_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        /var/www/html;
-    index       index.php index.html index.htm;
-    access_log /var/log/nginx/domains/%domain%.log combined;
-    error_log  /var/log/nginx/domains/%domain%.error.log error;
-    
-    ssl_stapling on;
-    ssl_stapling_verify on;
-    
+listen       %ip%:%proxy_port%;
+server_name  %domain_idn% %alias_idn%;
+index       index.php index.html index.htm;
+access_log /var/log/nginx/domains/%domain%.log combined;
+error_log  /var/log/nginx/domains/%domain%.error.log error;
+
+include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*;
+
     location ~ /\.(?!well-known\/) {
         deny all;
         return 404;
     }
-    
+
     location / {
-        try_files $uri $uri/ =404;
-        alias /var/www/html;
+        proxy_pass  http://%ip%:%web_port%;
     }
-    
-    location /error/ {
-        alias /var/www/document_errors/;
-    }
-    
-    location @fallback {
-        proxy_pass https://%ip%:%web_ssl_port%;
-    }
-    
-    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
-}
+}