X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/29be45d12023e4f60db03cdade5924642113cfa6..11d0975caf6d12fb54162b81a554e1b6c1e6317a:/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 206d54c07..0312712bc 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -191,9 +191,15 @@
#
ProxySet lbmethod=bybusyness
+<% if port == 443 -%>
+ BalancerMember https://rails1
+ BalancerMember https://rails2
+ BalancerMember https://rails3
+<% else -%>
BalancerMember http://rails1
BalancerMember http://rails2
BalancerMember http://rails3
+<% end -%>
<% if port == 80 -%>
@@ -282,6 +288,15 @@
RedirectPermanent / http://www.openstreetmap.org/
+
+ ServerName openstreetmap.org
+ ServerAlias maps.openstreetmap.org mapz.openstreetmap.org
+
+ SSLEngine on
+
+ RedirectPermanent / https://www.openstreetmap.org/
+
+
ServerName openstreetmap.org.uk
ServerAlias www.openstreetmap.org.uk