Merge branch 'master' into openstreetbugs

[rails.git] / config / nginx.conf

diff --git a/config/nginx.conf b/config/nginx.conf
index 5071a260b1fa3b0b88bf08414107d1406462c53c..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;
@@ -220,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 / {
@@ -231,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$ {