X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/daa069c2e0be98ecc5a4f0366a3ddde5a8a71b5e..6fcd4e5fe49648d1832465308790beede845b098:/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..51d43a394 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -268,7 +268,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 +280,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 *