X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ffd932724942b9cc9640ebd0dae971b1aa21cf48..d7eb7df41c4c67b388e191a3da66714eb4bd6cd8:/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 27a1b79b0..08489dc86 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -95,7 +95,6 @@
# Set expiry for assets
#
- Header unset Last-Modified
Header unset ETag
FileETag None
@@ -106,7 +105,6 @@
# Set expiry for attachments
#
- Header unset Last-Modified
Header unset ETag
FileETag None
@@ -159,6 +157,7 @@
PassengerMaxRequestQueueSize 250
PassengerPreStart https://www.openstreetmap.org/
PassengerAppGroupName rails
+ SetEnv OPENSTREETMAP_STATUS <%= @status %>
SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers
@@ -268,7 +267,6 @@
ServerName openstreetmap.org
- ServerAlias *
Header always set Cache-Control "max-age=31536000"
Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
@@ -281,6 +279,21 @@
RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent]
+
+ ServerName www.openstreetmap.org
+ ServerAlias *
+
+ Header always set Cache-Control "max-age=31536000"
+ Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
+
+ RewriteEngine on
+
+ RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
+
+ RewriteCond %{REQUEST_URI} !^/server-status$
+ RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]
+
+
ServerName openstreetmap.org
ServerAlias *