From 89e79e81b8da8ec51cf058e4877a749031477d92 Mon Sep 17 00:00:00 2001 From: Matt Amos Date: Tue, 19 Jul 2016 14:12:16 +0100 Subject: [PATCH] Use backends in York, while Ramoth is sick/recovering. --- .../web/templates/default/apache.frontend.erb | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb index ad5158d5e..fa9ab5474 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -185,18 +185,18 @@ # # 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://bytemark/api/0.6/map + ProxyPass /api/0.6/tracepoints balancer://bytemark/api/0.6/tracepoints + ProxyPass /api/0.6/amf/read balancer://bytemark/api/0.6/amf/read + ProxyPass /api/0.6/swf/trackpoints balancer://bytemark/api/0.6/swf/trackpoints ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://bytemark$1 - ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/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 - ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://backend$1 + ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://bytemark$1 + ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://bytemark$1 + ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://bytemark$1 + ProxyPass /api/0.6/nodes balancer://bytemark/api/0.6/nodes + ProxyPass /api/0.6/ways balancer://bytemark/api/0.6/ways + ProxyPass /api/0.6/relations balancer://bytemark/api/0.6/relations + ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://bytemark$1 # # Redirect trac and wiki requests to the right places -- 2.43.2