Update template files for new webmail configuration

install/deb/multiphp/nginx/PHP-56.stpl

@@ -48,7 +48,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/multiphp/nginx/PHP-56.tpl

@@ -47,7 +47,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/multiphp/nginx/PHP-70.stpl

@@ -48,7 +48,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/multiphp/nginx/PHP-70.tpl

@@ -47,7 +47,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/multiphp/nginx/PHP-71.stpl

@@ -48,7 +48,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/multiphp/nginx/PHP-71.tpl

@@ -47,7 +47,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/multiphp/nginx/PHP-72.stpl

@@ -48,7 +48,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/multiphp/nginx/PHP-72.tpl

@@ -47,7 +47,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/multiphp/nginx/PHP-73.stpl

@@ -48,7 +48,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/multiphp/nginx/PHP-73.tpl

@@ -47,7 +47,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/nginx/webmail.conf

@@ -0,0 +1,82 @@
+server {
+    listen      %ip%:%proxy_port%;
+    server_name %webmail_alias%.*;
+
+    location / {
+        proxy_pass      http://%ip%:%web_port%;
+        location ~* ^.+\.(jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm)$ {
+            alias          /var/lib/roundcube/;
+            expires        15m;
+            try_files      $uri @fallback;
+        }
+    }
+
+    location /error/ {
+        alias   /var/www/document_errors/;
+    }
+
+    location ~ /(config|temp|logs) {
+        return 404;
+    }
+
+    location ~ ^/(.*\.php)$ {
+        alias /var/lib/roundcube/$1;
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+    }
+    
+    location @fallback {
+        proxy_pass      http://%ip%:%web_port%;
+    }
+
+    location ~ /\.ht    {return 404;}
+    location ~ /\.svn/  {return 404;}
+    location ~ /\.git/  {return 404;}
+    location ~ /\.hg/   {return 404;}
+    location ~ /\.bzr/  {return 404;}
+}
+
+server {
+    listen      %ip%:%proxy_ssl_port% ssl http2;
+    server_name %webmail_alias%.*;
+    ssl_certificate      /usr/local/hestia/ssl/certificate.crt;
+    ssl_certificate_key  /usr/local/hestia/ssl/certificate.key;
+
+    location / {
+        proxy_pass      https://%ip%:%web_ssl_port%;
+        location ~* ^.+\.(jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm)$ {
+            alias          /var/lib/roundcube/;
+            expires        15m;
+            try_files      $uri @fallback;
+        }
+    }
+
+    location /error/ {
+        alias   /var/www/document_errors/;
+    }
+
+    location ~ /(config|temp|logs) {
+        return 404;
+    }
+
+    location ~ ^/(.*\.php)$ {
+        alias /var/lib/roundcube/$1;
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+    }
+
+    location @fallback {
+        proxy_pass      https://%ip%:%web_ssl_port%;
+    }
+
+    location ~ /\.ht    {return 404;}
+    location ~ /\.svn/  {return 404;}
+    location ~ /\.git/  {return 404;}
+    location ~ /\.hg/   {return 404;}
+    location ~ /\.bzr/  {return 404;}
+
+}

install/deb/roundcube/apache.conf

@@ -1,40 +1,90 @@
-Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
-Alias /roundcube /var/lib/roundcube
-Alias /webmail /var/lib/roundcube
+<VirtualHost %ip%:%web_port%>
+    ServerAlias %webmail_alias%.*
+    Alias / /var/lib/roundcube/
+    Alias /error/ /var/www/document_errors/
+    #SuexecUserGroup %user% %group%
+    
+    <Directory "/usr/share/tinymce/www/">
+      Options Indexes MultiViews FollowSymLinks
+      AllowOverride None
+      Order allow,deny
+      allow from all
+    </Directory>
+
+    <Directory /var/lib/roundcube/>
+        Options +FollowSymLinks
+        # This is needed to parse /var/lib/roundcube/.htaccess. See its
+        # content before setting AllowOverride to None.
+        AllowOverride All
+        order allow,deny
+        allow from all
+    </Directory>
+
+    # Protecting basic directories:
+    <Directory /var/lib/roundcube/config>
+            Options -FollowSymLinks
+            AllowOverride None
+    </Directory>
+
+    <Directory /var/lib/roundcube/temp>
+            Options -FollowSymLinks
+            AllowOverride None
+        Order allow,deny
+        Deny from all
+    </Directory>
 
-# Access to tinymce files
-<Directory "/usr/share/tinymce/www/">
+    <Directory /var/lib/roundcube/logs>
+            Options -FollowSymLinks
+            AllowOverride None
+        Order allow,deny
+        Deny from all
+    </Directory>
+</VirtualHost>
+
+<VirtualHost %ip%:%web_ssl_port%>
+    ServerAlias %webmail_alias%.*
+    Alias / /var/lib/roundcube/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    #SuexecUserGroup %user% %group%
+    
+    SSLEngine on
+    SSLVerifyClient none
+    SSLCertificateFile         /usr/local/hestia/ssl/certificate.crt
+    SSLCertificateKeyFile      /usr/local/hestia/ssl/certificate.key
+
+    <Directory "/usr/share/tinymce/www/">
       Options Indexes MultiViews FollowSymLinks
       AllowOverride None
       Order allow,deny
       allow from all
-</Directory>
-
-<Directory /var/lib/roundcube/>
-  Options +FollowSymLinks
-  # This is needed to parse /var/lib/roundcube/.htaccess. See its
-  # content before setting AllowOverride to None.
-  AllowOverride All
-  order allow,deny
-  allow from all
-</Directory>
-
-# Protecting basic directories:
-<Directory /var/lib/roundcube/config>
-        Options -FollowSymLinks
-        AllowOverride None
-</Directory>
-
-<Directory /var/lib/roundcube/temp>
-        Options -FollowSymLinks
-        AllowOverride None
-	Order allow,deny
-	Deny from all
-</Directory>
-
-<Directory /var/lib/roundcube/logs>
-        Options -FollowSymLinks
-        AllowOverride None
-	Order allow,deny
-	Deny from all
-</Directory>
+    </Directory>
+
+    <Directory /var/lib/roundcube/>
+        Options +FollowSymLinks
+        # This is needed to parse /var/lib/roundcube/.htaccess. See its
+        # content before setting AllowOverride to None.
+        AllowOverride All
+        order allow,deny
+        allow from all
+    </Directory>
+
+    # Protecting basic directories:
+    <Directory /var/lib/roundcube/config>
+            Options -FollowSymLinks
+            AllowOverride None
+    </Directory>
+
+    <Directory /var/lib/roundcube/temp>
+            Options -FollowSymLinks
+            AllowOverride None
+        Order allow,deny
+        Deny from all
+    </Directory>
+
+    <Directory /var/lib/roundcube/logs>
+            Options -FollowSymLinks
+            AllowOverride None
+        Order allow,deny
+        Deny from all
+    </Directory>
+</VirtualHost>

install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -49,7 +49,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl

@@ -48,7 +48,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/codeigniter2.stpl

@@ -54,7 +54,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/codeigniter2.tpl

@@ -53,7 +53,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/codeigniter3.stpl

@@ -49,7 +49,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/codeigniter3.tpl

@@ -48,7 +48,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl

@@ -120,7 +120,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl

@@ -119,7 +119,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/default.stpl

@@ -48,7 +48,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/default.tpl

@@ -47,7 +47,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl

@@ -65,7 +65,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl

@@ -63,7 +63,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/drupal6.stpl

@@ -88,7 +88,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/drupal6.tpl

@@ -87,7 +87,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/drupal7.stpl

@@ -88,7 +88,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/drupal7.tpl

@@ -87,7 +87,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/drupal8.stpl

@@ -88,7 +88,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/drupal8.tpl

@@ -87,7 +87,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/joomla.stpl

@@ -56,7 +56,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/joomla.tpl

@@ -55,7 +55,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/laravel.stpl

@@ -49,7 +49,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/laravel.tpl

@@ -46,7 +46,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/magento.stpl

@@ -191,7 +191,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/magento.tpl

@@ -190,7 +190,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/modx.stpl

@@ -62,7 +62,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/modx.tpl

@@ -61,7 +61,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/moodle.stpl

@@ -83,7 +83,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/moodle.tpl

@@ -83,7 +83,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/no-php.stpl

@@ -40,7 +40,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/no-php.tpl

@@ -39,7 +39,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/odoo.stpl

@@ -63,7 +63,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/odoo.tpl

@@ -62,7 +62,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/opencart.stpl

@@ -52,7 +52,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/opencart.tpl

@@ -50,7 +50,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/owncloud.stpl

@@ -78,7 +78,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/owncloud.tpl

@@ -77,7 +77,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/piwik.stpl

@@ -66,7 +66,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/piwik.tpl

@@ -65,7 +65,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/pyrocms.stpl

@@ -59,7 +59,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/pyrocms.tpl

@@ -58,7 +58,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/sendy.stpl

@@ -82,7 +82,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }

install/deb/templates/web/nginx/php-fpm/sendy.tpl

@@ -82,7 +82,5 @@ server {
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }