Merge branch 'develop' into webui-refresh-winterfell

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

@@ -4,8 +4,21 @@ server {
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
     root        /var/lib/roundcube;
-    index       index.php;
-    
+    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;
+
+    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;
@@ -16,13 +29,21 @@ server {
         return 404;
     }
 
-    location / {
-        proxy_pass http://%ip%:%web_port%;
-        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)$ {
-            alias /var/lib/roundcube/;
-            expires 1h;
-            try_files $uri @fallback;
-        }
+    location ~ ^/(README.md|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 ~ ^/(.*\.php)$ {
@@ -31,18 +52,19 @@ server {
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
+        fastcgi_param HTTPS on;
     }
     
-    location @fallback {
-        proxy_pass http://%ip%:%web_port%;
-    }
-
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
-    error_page 500 502 503 504 /error/50x.html;
+    error_page 500 502 503 504 505 /error/50x.html;
     
     location /error/ {
-        alias   %home%/%user%/web/%root_domain%/document_errors/;
+        alias       /var/www/document_errors/;
+    }
+
+    location @fallback {
+        proxy_pass http://%ip%:%web_port%;
     }
 
     include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;

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

@@ -2,10 +2,23 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain% %alias%;
     root        /var/lib/roundcube;
-    index       index.php;
+    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;
 
     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;
@@ -16,13 +29,21 @@ server {
         return 404;
     }
 
-    location / {
-        proxy_pass http://%ip%:%web_port%;
-        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)$ {
-            alias /var/lib/roundcube/;
-            expires 1h;
-            try_files $uri @fallback;
-        }
+    location ~ ^/(README.md|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 ~ ^/(.*\.php)$ {
@@ -33,16 +54,16 @@ server {
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
     
-    location @fallback {
-        proxy_pass http://%ip%:%web_port%;
-    }
-
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
-    error_page 500 502 503 504 /error/50x.html;
-    
+    error_page 500 502 503 504 505 /error/50x.html;
+
     location /error/ {
-        alias   %home%/%user%/web/%root_domain%/document_errors/;
+        alias       /var/www/document_errors/;
+    }
+
+    location @fallback {
+        proxy_pass http://%ip%:%web_port%;
     }
 
     include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;

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

@@ -4,8 +4,22 @@ server {
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
     root        /var/lib/roundcube;
-    index       index.php;
+    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;
+
+    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;
@@ -15,13 +29,22 @@ server {
         deny all;
         return 404;
     }
+	
+    location ~ ^/(README.md|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
+        deny all;
+        return 404;
+    }
 
-    location / {
-        try_files $uri $uri/ /index.php?$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 1h;
-            fastcgi_hide_header "Set-Cookie";
-        }
+    location ~ ^/(bin|SQL)/ {
+        deny all;
+        return 404;
+    }
+    
+    location ~ /\. {
+        return 404;
+        deny all;
+        access_log off;
+        log_not_found off;
     }
 
     location ~ ^/(.*\.php)$ {
@@ -30,14 +53,15 @@ 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 /error/50x.html;
-    
+    error_page 500 502 503 504 505 /error/50x.html;
+
     location /error/ {
-        alias   %home%/%user%/web/%root_domain%/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

@@ -2,10 +2,25 @@ server {
     listen      %ip%:%web_port%;
     server_name %domain% %alias%;
     root        /var/lib/roundcube;
-    index       index.php;
+    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;
 
     include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*;
-    
+
+	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;
@@ -15,13 +30,22 @@ server {
         deny all;
         return 404;
     }
+	
+    location ~ ^/(README.md|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
+        deny all;
+        return 404;
+    }
 
-    location / {
-        try_files $uri $uri/ /index.php?$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 1h;
-            fastcgi_hide_header "Set-Cookie";
-        }
+    location ~ ^/(bin|SQL)/ {
+        deny all;
+        return 404;
+    }
+    
+    location ~ /\. {
+        return 404;
+        deny all;
+        access_log off;
+        log_not_found off;
     }
 
     location ~ ^/(.*\.php)$ {
@@ -34,10 +58,10 @@ server {
     
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
-    error_page 500 502 503 504 /error/50x.html;
-    
+    error_page 500 502 503 504 505 /error/50x.html;
+
     location /error/ {
-        alias   %home%/%user%/web/%root_domain%/document_errors/;
+        alias       /var/www/document_errors/;
     }
 
     include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;