Keep /relation/N/full with rails for now

[chef.git] / cookbooks / web / templates / default / apache.frontend.erb

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 39075857b77a66636e1898faa23523d3f77301bc..a86c0d13a3cfb3dfce883e66178abb0698a6ef98 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -170,6 +170,7 @@
   ProxyPassMatch ^(/api/0.6/.*/(full|history|search|ways))$ balancer://bulkapi$1
   ProxyPass /api/0.6/nodes balancer://bulkapi/api/0.6/nodes
   ProxyPass /api/0.6/ways balancer://bulkapi/api/0.6/ways
   ProxyPassMatch ^(/api/0.6/.*/(full|history|search|ways))$ balancer://bulkapi$1
   ProxyPass /api/0.6/nodes balancer://bulkapi/api/0.6/nodes
   ProxyPass /api/0.6/ways balancer://bulkapi/api/0.6/ways

+  ProxyPass /api/0.6/relations balancer://bulkapi/api/0.6/relations

   ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://bulkapi$1
 
   #
   ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://bulkapi$1
 
   #


@@ -273,6 +274,6 @@
   ServerAlias openstreetmap.co.uk
   ServerAlias www.openstreetmap.co.uk
 
   ServerAlias openstreetmap.co.uk
   ServerAlias www.openstreetmap.co.uk
 

-  RedirectPermanent /events.ics http://openstreetmap.org.uk/events.ics
+  RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics

   RedirectPermanent / http://www.openstreetmap.org/
 </VirtualHost>
   RedirectPermanent / http://www.openstreetmap.org/
 </VirtualHost>