X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/29be45d12023e4f60db03cdade5924642113cfa6..33dbd3053aaa10016508a6cd73e0ed0f99d13b9a:/cookbooks/web/templates/default/apache.frontend.erb?ds=sidebyside
diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 206d54c07..7f34564c0 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -14,6 +14,7 @@
# Enable SSL
#
SSLEngine on
+ SSLProxyEngine on
<% end -%>
#
@@ -191,9 +192,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 -%>
@@ -222,12 +229,6 @@
RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
<% elsif port == 443 -%>
- #
- # Redirect requests which don't work over https to http
- #
- RewriteCond %{REQUEST_URI} ^/edit$
- RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
-
#
# Redirect api requests made to www.osm.org to api.osm.org
#
@@ -282,6 +283,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