From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Oct 2013 18:03:01 +0000 (+0100)
Subject: Use cgimap for multi object fetches
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/73aaee701cdaa8d04c3faa489c0aa1d2ae02fadc?ds=sidebyside

Use cgimap for multi object fetches
---

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index fa13948d8..ed80fd21d 100644
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -23,6 +23,7 @@ include_recipe "web::cgimap"
 
 apache_module "fastcgi-handler"
 apache_module "remoteip"
+apache_module "rewrite"
 
 apache_site "default" do
   action [ :disable ]
diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index 17200cab9..5cd50fb44 100644
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -15,6 +15,11 @@
   CustomLog /var/log/apache2/access.log combined_with_time
   ErrorLog /var/log/apache2/error.log
 
+  #
+  # Turn on the rewrite engine
+  #
+  RewriteEngine on
+
   #
   # Configure rails
   #
@@ -31,9 +36,8 @@
   RemoteIPTrustedProxy 146.179.159.160/27
 
   #
-  # Pass map calls to cgimap
+  # Pass supported calls to cgimap
   #
-  <Location /api/0.6/map>
-    SetHandler fcgi:127.0.0.1:8000
-  </Location>
+  RewriteRule ^/api/0\.6/map$ - [H=fcgi:127.0.0.1:8000]
+  RewriteRule ^/api/0\.6/(nodes|ways|relations)$ - [H=fcgi:127.0.0.1:8000]
 </VirtualHost>