Browse Source

Fix server error pages not loading properly

Kristan Kenney 6 years ago
parent
commit
bbf67235b2

+ 6 - 7
install/deb/templates/mail/nginx/default.stpl

@@ -9,8 +9,8 @@ server {
     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)$ {
+        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 1h;
             fastcgi_hide_header "Set-Cookie";
         }
@@ -50,14 +50,13 @@ server {
         proxy_pass http://%ip%:%web_port%;
     }
 
-    location /error/ {
-        root   /var/www/document_errors;
-    }
-
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
     error_page 500 502 503 504 /error/50x.html;
-    
+
+    location /error/ {
+        alias   /var/www/document_errors/;
+    }
 
     include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
 }

+ 5 - 5
install/deb/templates/mail/nginx/default.tpl

@@ -10,7 +10,7 @@ server {
         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)$ {
+        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";
         }
@@ -50,13 +50,13 @@ server {
         proxy_pass http://%ip%:%web_port%;
     }
 
-    location /error/ {
-        root   /var/www/document_errors;
-    }
-
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
     error_page 500 502 503 504 /error/50x.html;
 
+    location /error/ {
+        alias   /var/www/document_errors/;
+    }
+
     include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
 }

+ 5 - 5
install/deb/templates/mail/nginx/web_system.stpl

@@ -12,7 +12,7 @@ server {
     
     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)$ {
+        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";
         }
@@ -48,13 +48,13 @@ server {
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
     
-    location /error/ {
-        root   /var/www/document_errors;
-    }
-
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
     error_page 500 502 503 504 /error/50x.html;
 
+    location /error/ {
+        alias   /var/www/document_errors/;
+    }
+
     include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
 }

+ 7 - 6
install/deb/templates/mail/nginx/web_system.tpl

@@ -12,7 +12,7 @@ server {
 
     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)$ {
+        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";
         }
@@ -48,13 +48,14 @@ server {
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
     
-    location /error/ {
-        root   /var/www/document_errors;
-    }
-
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
     error_page 500 502 503 504 /error/50x.html;
-    
+
+    location /error/ {
+        alias   /var/www/document_errors/;
+
+    }
+
     include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
 }