X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/edb4306c20393d628929d27ebda556c77dc437b4..0689c09ff5ec373c978c55abb058f4dfdee6ada6:/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 8effc61e5..7bfe6a3e2 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 -%>
 
   #
@@ -136,6 +137,7 @@
   PassengerMinInstances 10
   PassengerMaxRequests 5000
   PassengerPreStart http://www.openstreetmap.org/
+  SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
   Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/images/favicon.ico
   Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers
   Alias /stats /store/rails/stats
@@ -191,9 +193,15 @@
   #
   <Proxy balancer://backend>
     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 -%>
   </Proxy>
 <% if port == 80 -%>
 
@@ -222,12 +230,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
   #
@@ -275,6 +277,8 @@
   ServerAlias maps.open-maps.org mapz.open-maps.org
   ServerAlias open-maps.com www.open-maps.com
   ServerAlias maps.open-maps.com mapz.open-maps.com
+  ServerAlias osmbugs.org www.osmbugs.org
+  ServerAlias maps.osmbugs.org mapz.osmbugs.org
 
   #Third Party Sites
   ServerAlias openstreetmap.pm www.openstreetmap.pm