From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Oct 2018 21:26:17 +0000 (+0100)
Subject: Restore redirect from http://openstreetmap.org to https://openstreetmap.org
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ffd932724942b9cc9640ebd0dae971b1aa21cf48

Restore redirect from http://openstreetmap.org to https://openstreetmap.org

This is necessary for HSTS preload - we cannot redirect directly
to the www.openstreetmap.org name!
---

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index b40d3774d..27a1b79b0 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -278,7 +278,7 @@
   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]
+  RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent]
 </VirtualHost>
 
 <VirtualHost *:443>