From 5e86b9ccd06109e97e2a66eac4df878c4062b6a2 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 18 Oct 2013 10:48:13 +0100 Subject: [PATCH] We only need to escape dots in ProxyPassMatch, not in ProxyPass --- .../web/templates/default/apache.frontend.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb index 244aa0b7c..ebe5721a4 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -162,16 +162,16 @@ # # Pass some other API calls to the backends via a load balancer # - ProxyPass /api/0\.6/map balancer://backend/api/0.6/map - ProxyPass /api/0\.6/tracepoints balancer://backend/api/0.6/tracepoints - ProxyPass /api/0\.6/amf/read balancer://backend/api/0.6/amf/read - ProxyPass /api/0\.6/swf/trackpoints balancer://backend/api/0.6/swf/trackpoints + ProxyPass /api/0.6/map balancer://backend/api/0.6/map + ProxyPass /api/0.6/tracepoints balancer://backend/api/0.6/tracepoints + ProxyPass /api/0.6/amf/read balancer://backend/api/0.6/amf/read + ProxyPass /api/0.6/swf/trackpoints balancer://backend/api/0.6/swf/trackpoints ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/(upload|download))$ balancer://backend$1 ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1 ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://backend$1 - ProxyPass /api/0\.6/nodes balancer://backend/api/0.6/nodes - ProxyPass /api/0\.6/ways balancer://backend/api/0.6/ways - ProxyPass /api/0\.6/relations balancer://backend/api/0.6/relations + ProxyPass /api/0.6/nodes balancer://backend/api/0.6/nodes + ProxyPass /api/0.6/ways balancer://backend/api/0.6/ways + ProxyPass /api/0.6/relations balancer://backend/api/0.6/relations ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://backend$1 # -- 2.43.2