Trying again to gently add replica DB & IC backends into the mix.

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index fa9ab5474a0c815842be68aaa2c2b75cb00aaf28..072b4d575a6e07c50a3e802e3c3e42366fdc07a1 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -193,7 +193,7 @@
   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
   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/nodes balancer://backend/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
   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


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

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

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