Merge branch 'bugfix-mail-nginx' into develop

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

@@ -1,49 +1,31 @@
 server {
     listen      %ip%:%proxy_ssl_port% ssl http2;
     server_name %domain% %alias%;
-    ssl_certificate      %ssl_pem%;
-    ssl_certificate_key  %ssl_key%;
+    ssl_certificate     %ssl_pem%;
+    ssl_certificate_key %ssl_key%;
     root        /var/lib/roundcube;
     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;
 
-    error_log /var/log/nginx/domains/%domain%.error.log;
-    access_log /var/log/nginx/domains/%domain%.access.log;
-
-    location / {
-        proxy_pass http://%ip%:%web_port%;
-        try_files $uri $uri/ /index.php?q=$uri&$args;
-        alias /var/lib/roundcube/;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
-            expires 7d;
-            fastcgi_hide_header "Set-Cookie";
-        }
-    }   
-
-    location ~ /(config|temp|logs) {
-        deny all;
-        return 404;
-    }
-    
     location ~ /\.(?!well-known\/) {
         deny all;
         return 404;
     }
 
-    location ~ ^/(README.md|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
+    location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
         deny all;
         return 404;
     }
 
-    location ~ ^/(bin|SQL)/ {
-        deny all;
-        return 404;
-    }
-
-    location ~ /\. {
-        return 404;
-        deny all;
-        access_log off;
-        log_not_found off;
+    location / {
+        proxy_pass https://%ip%:%web_ssl_port%;
+        try_files $uri $uri/ /index.php?q=$uri&$args;
+        alias /var/lib/roundcube/;
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+            expires 7d;
+            fastcgi_hide_header "Set-Cookie";
+        }
     }
 
     location ~ ^/(.*\.php)$ {
@@ -52,19 +34,18 @@ server {
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
-        fastcgi_param HTTPS on;
     }
-    
+
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
     error_page 500 502 503 504 505 /error/50x.html;
-    
+
     location /error/ {
-        alias       /var/www/document_errors/;
+        alias /var/www/document_errors/;
     }
 
     location @fallback {
-        proxy_pass http://%ip%:%web_port%;
+        proxy_pass https://%ip%:%web_ssl_port%;
     }
 
     include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;

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

@@ -3,47 +3,29 @@ server {
     server_name %domain% %alias%;
     root        /var/lib/roundcube;
     index       index.php index.html index.htm;
-
-    error_log /var/log/nginx/domains/%domain%.error.log;
-    access_log /var/log/nginx/domains/%domain%.access.log;
+    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 / {
-        proxy_pass http://%ip%:%web_port%;
-        try_files $uri $uri/ /index.php?q=$uri&$args;
-        alias /var/lib/roundcube/;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
-            expires 7d;
-            fastcgi_hide_header "Set-Cookie";
-        }
-    }
-
-    location ~ /(config|temp|logs) {
-        deny all;
-        return 404;
-    }
-    
     location ~ /\.(?!well-known\/) {
         deny all;
         return 404;
     }
 
-    location ~ ^/(README.md|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
+    location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
         deny all;
         return 404;
     }
 
-    location ~ ^/(bin|SQL)/ {
-        deny all;
-        return 404;
-    }
-
-    location ~ /\. {
-        return 404;
-        deny all;
-        access_log off;
-        log_not_found off;
+    location / {
+        proxy_pass http://%ip%:%web_port%;
+        try_files $uri $uri/ /index.php?q=$uri&$args;
+        alias /var/lib/roundcube/;
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+            expires 7d;
+            fastcgi_hide_header "Set-Cookie";
+        }
     }
 
     location ~ ^/(.*\.php)$ {
@@ -53,13 +35,13 @@ server {
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
-    
+
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
     error_page 500 502 503 504 505 /error/50x.html;
 
     location /error/ {
-        alias       /var/www/document_errors/;
+        alias /var/www/document_errors/;
     }
 
     location @fallback {

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

@@ -1,50 +1,29 @@
 server {
     listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain% %alias%;
-    ssl_certificate      %ssl_pem%;
-    ssl_certificate_key  %ssl_key%;
+    ssl_certificate     %ssl_pem%;
+    ssl_certificate_key %ssl_key%;
     root        /var/lib/roundcube;
     index       index.php index.html index.htm;
-   
-    error_log /var/log/nginx/domains/%domain%.error.log;
-    access_log /var/log/nginx/domains/%domain%.access.log;
+    access_log /var/log/nginx/domains/%domain%.log combined;
+    error_log  /var/log/nginx/domains/%domain%.error.log error;
 
-    location =/ {
-        try_files $uri $uri/ /index.php?q=$uri&$args;
-    }
-    
-    location / {
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
-            expires 7d;
-            fastcgi_hide_header "Set-Cookie";
-        }
-    }
-
-    location ~ /(config|temp|logs) {
-        deny all;
-        return 404;
-    }
-    
     location ~ /\.(?!well-known\/) {
         deny all;
         return 404;
     }
-	
-    location ~ ^/(README.md|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
-        deny all;
-        return 404;
-    }
 
-    location ~ ^/(bin|SQL)/ {
+    location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
         deny all;
         return 404;
     }
-    
-    location ~ /\. {
-        return 404;
-        deny all;
-        access_log off;
-        log_not_found off;
+
+    location / {
+        try_files $uri $uri/ /index.php?q=$uri&$args;
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+            expires 7d;
+            fastcgi_hide_header "Set-Cookie";
+        }
     }
 
     location ~ ^/(.*\.php)$ {
@@ -53,15 +32,14 @@ server {
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
-        fastcgi_param HTTPS on;
     }
-    
+
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
     error_page 500 502 503 504 505 /error/50x.html;
 
     location /error/ {
-        alias        /var/www/document_errors/;
+        alias /var/www/document_errors/;
     }
 
     include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;

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

@@ -4,23 +4,23 @@ server {
     root        /var/lib/roundcube;
     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;
+    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 ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
         deny all;
         return 404;
     }
-    
+
     location / {
-       try_files $uri $uri/ /index.php?q=$uri&$args;
-       location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        try_files $uri $uri/ /index.php?q=$uri&$args;
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 7d;
             fastcgi_hide_header "Set-Cookie";
         }
@@ -33,7 +33,7 @@ server {
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
-    
+
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
     error_page 500 502 503 504 505 /error/50x.html;