X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2a1699d4d61fef62763ce1773c2eb7d7e8df2d56..e2e7455fbda41bef4885a81d67f9cf45f127638c:/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 ea64b6fa4..ad5158d5e 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -185,12 +185,12 @@ # # Pass some other API calls to the backends via a load balancer # - 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 + 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)$ balancer://bytemark$1 - ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ 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 @@ -215,7 +215,7 @@ # ProxySet lbmethod=bybusyness -<% (node[:web][:backends] + ["rails4.bm", "rails5.bm"]).each do |backend| -%> +<% node[:web][:backends].each do |backend| -%> <% if port == 443 -%> BalancerMember https://<%= backend %> disablereuse=on <% else -%>