Revert "Gently add one backend back to the replica database."

This reverts commit 1fe9f1194b319f652aacf12d462a8df9eeba01a2.

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index b2375256f249995dd2741c2942eaa615c511a539..fa9ab5474a0c815842be68aaa2c2b75cb00aaf28 100644 (file)
--- 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
   #
   #
   # Pass some other API calls to the backends via a load balancer
   #

-  ProxyPass /api/0.6/map balancer://balancer/api/0.6/map
-  ProxyPass /api/0.6/tracepoints balancer://balancer/api/0.6/tracepoints
-  ProxyPass /api/0.6/amf/read balancer://balancer/api/0.6/amf/read
-  ProxyPass /api/0.6/swf/trackpoints balancer://balancer/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]+/upload)$ balancer://bytemark$1

-  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://balancer$1
-  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://balancer$1
-  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://balancer$1
-  ProxyPass /api/0.6/nodes balancer://balancer/api/0.6/nodes
-  ProxyPass /api/0.6/ways balancer://balancer/api/0.6/ways
-  ProxyPass /api/0.6/relations balancer://balancer/api/0.6/relations
-  ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://balancer$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
 
   #
   # Redirect trac and wiki requests to the right places


@@ -215,7 +215,7 @@
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness

-<% (node[:web][:backends][0..0] + ["rails4.bm", "rails5.bm"]).each do |backend| -%>
+<% node[:web][:backends].each do |backend| -%>

 <% if port == 443 -%>
     BalancerMember https://<%= backend %> disablereuse=on
 <% else -%>
 <% if port == 443 -%>
     BalancerMember https://<%= backend %> disablereuse=on
 <% else -%>