X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b7a7d93d6d9850c5ace31735c6a773e614f7d017..33dbd3053aaa10016508a6cd73e0ed0f99d13b9a:/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 5f189ba37..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,14 +192,20 @@
#
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 -%>
#
- # Redirect requests which should be secure to the SSL site
+ # Redirect requests which should be secure to https
#
RewriteCond %{REQUEST_URI} ^/login(\.html)?$ [OR]
RewriteCond %{REQUEST_URI} ^/user/(new|create-account\.html)$ [OR]
@@ -223,27 +230,17 @@
<% elsif port == 443 -%>
#
- # Redirect api requests to api.osm.org over http
+ # Redirect api requests made to www.osm.org to api.osm.org
#
- RewriteRule ^/api/(.*)$ http://api.openstreetmap.org/api/$1 [L,NE,R=permanent]
+# RewriteCond %{HTTP_HOST} =www.openstreetmap.org
+# RewriteRule ^/api/(.*)$ https://api.openstreetmap.org/api/$1 [L,NE,R=permanent]
#
- # Redirect requests which do not need to be secure over http
+ # Redirect non-api requests made to api.osm.org to www.osm.org
#
- RewriteCond %{REQUEST_URI} !^/login(.html)?$
- RewriteCond %{REQUEST_URI} !^/user/(new|create-account.html)$
- RewriteCond %{REQUEST_URI} !^/user/terms$
- RewriteCond %{REQUEST_URI} !^/user/save$
- RewriteCond %{REQUEST_URI} !^/user/go_public$
- RewriteCond %{REQUEST_URI} !^/user/([^/]+)/account$
- RewriteCond %{REQUEST_URI} !^/user/reset-password$
- RewriteCond %{REQUEST_URI} !^/preview/
- RewriteCond %{REQUEST_URI} !^/assets/
- RewriteCond %{REQUEST_URI} !^/javascripts/
- RewriteCond %{REQUEST_URI} !^/images/
- RewriteCond %{REQUEST_URI} !^/stylesheets/
- RewriteCond %{REQUEST_URI} !^/openlayers/
- RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
+ RewriteCond %{HTTP_HOST} =api.openstreetmap.org
+ RewriteCond %{REQUEST_URI} !^/api/
+ RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]
<% end -%>
@@ -286,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