Make "Your OpenID is not associated with a OpenStreetMap account yet" message valid...

[rails.git] / config / nginx.conf

diff --git a/config/nginx.conf b/config/nginx.conf
index 1da97a6d549cbc69187f46f108ff6c223f084a64..ae349b7466c17409059fcc95209753ef656c3ef7 100644 (file)
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -64,6 +64,10 @@ http {
         server 127.0.0.1:8023;
         server 127.0.0.1:8024;
         server 127.0.0.1:8025;
+    }
+
+    # Define fastcgi backend for geocoder searches
+    upstream geocoder_backend {
         server 127.0.0.1:8026;
         server 127.0.0.1:8027;
         server 127.0.0.1:8028;
@@ -103,13 +107,13 @@ http {
         server 10.0.0.10:8003;
         server 10.0.0.11:8003;
         server 10.0.0.12:8003;
+        server 10.0.0.10:8004;
+        server 10.0.0.11:8004;
+        server 10.0.0.12:8004;
     }
     
     # Define fastcgi backend for tiles@home requests
     upstream tah_backend {
-        server 10.0.0.10:8004;
-        server 10.0.0.11:8004;
-        server 10.0.0.12:8004;
         server 10.0.0.10:8005;
         server 10.0.0.11:8005;
         server 10.0.0.12:8005;
@@ -157,15 +161,20 @@ http {
  
         # Strip asset tags
         location ~ ^/(images|javascripts|openlayers|stylesheets|user/image)/ {
+            # Strip asset tags
             rewrite ^/(.*)/[0-9]+$ /$1;
+
+            # Set expiry to the maximum - the asset tag will change
+            # when there is a new version
             expires max;
 
-            # Handle Special Case Expiry
+            # Only cache OpenLayers for seven days though
             if ($uri ~ ^/openlayers/) {
                 expires 7d;
             }
         }
-        # Handle Special Case Expiry
+
+        # Cache the embedded map page for seven days
         location ~ ^/export/embed.html$ {
             expires 7d;
         }
@@ -215,6 +224,18 @@ http {
             return 404;
         }
             
+        # Send unversioned capabilities requests to the api backend
+        location = /api/capabilities {
+            fastcgi_pass api_backend;
+            break;
+        }
+
+        # Send geocoder searches to the geocoder backend
+        location /geocoder/ { 
+            fastcgi_pass geocoder_backend;
+            break;
+        }
+
         # Send everything else to the web backend unless it exists
         # in the rails public tree    
         location / {
@@ -226,11 +247,6 @@ http {
             }
         }
 
-        location = /api/capabilities {
-            fastcgi_pass web_backend;
-            break;
-        }
-
         # Set the MIME type for crossdomain.xml policy files
         # or flash will ignore it
         location ~ /crossdomain\.xml$ {