X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9b3496d2e29006154afb29e549230f8e4f201612..023e95f1bc6945dc1d20f3d228b126b12992bc0a:/config/nginx.conf

diff --git a/config/nginx.conf b/config/nginx.conf
index 7cde7741b..3fdf72f1a 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -143,7 +143,7 @@ http {
             rewrite ^/(0\.[0-9]+)/(.*)$ /api/$1/$2;
             rewrite ^/capabilities$ /api/capabilities;
         }
-    
+ 
         # Strip asset tags
         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;
         }
@@ -225,5 +228,13 @@ http {
                 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;
+        }
     }
 }