X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/658ae403e25fd4aa75e335579367952686ca5a18..7b812075e1b4587296cae9be98f909b7e8b42a45:/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 3039a96c8..76b172e0b 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -137,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
@@ -229,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
#
@@ -282,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
@@ -307,3 +304,29 @@
RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics
RedirectPermanent / http://www.openstreetmap.org/
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+
+/rails/public>
+ Require all granted
+
+
+
+ Require all granted
+
+
+
+ Require all granted
+
+
+
+ Require all granted
+
+
+
+ Require all granted
+
+
+
+ Require all granted
+
+<% end -%>