Ensure :not_found status is returned, catching RecordNotFound doesn't work as isnt...

[rails.git] / config / nginx.conf

diff --git a/config/nginx.conf b/config/nginx.conf
index ae779854686bafb52270be786e6a0efb7012ec27..3fdf72f1a9afb300ff3463d40bf1fbe2459242ab 100644 (file)
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -143,9 +143,9 @@ http {
             rewrite ^/(0\.[0-9]+)/(.*)$ /api/$1/$2;
             rewrite ^/capabilities$ /api/capabilities;
         }
-    
+ 
         # Strip asset tags
-        location ~ ^/(images|javascripts|openlayers|stylesheets)/ {
+        location ~ ^/(images|javascripts|openlayers|stylesheets|user/image)/ {
             rewrite ^/(.*)/[0-9]+$ /$1;
         }
 
@@ -164,18 +164,21 @@ http {
 
         # Handle bulk api requests
         location ~ ^/api/0\.6/(map|relation|trackpoints|amf|amf/read|swf/trackpoints|trace/[0-9]+/data)$ {
+            fastcgi_read_timeout 300;
             fastcgi_pass bulkapi_backend;
             break;
         }
         
         # Send search requests to the bulk api backend
         location ~ ^/api/0\.6/.*/search$ {
+            fastcgi_read_timeout 300;
             fastcgi_pass bulkapi_backend;
             break;
         }
 
         # Send requests for full objects to the bulk api backend
         location ~ ^/api/0\.6/.*/full$ {
+            fastcgi_read_timeout 300;
             fastcgi_pass bulkapi_backend;
             break;
         }
@@ -220,10 +223,18 @@ http {
 
         # Set the MIME type for crossdomain.xml policy files
         # or flash will ignore it
-        location ~ /crossdomain\.xml {
-                       types {
-                               text/x-cross-domain-policy xml;
-                       }
+        location ~ /crossdomain\.xml$ {
+            types {
+                text/x-cross-domain-policy xml;
+            }
+        }
+
+        # Give munin access to some statistics
+        location /server-status {
+            stub_status on;
+            access_log off;
+            allow 127.0.0.1;
+            deny all;
         }
     }
 }