From 4a1fc4f0dd3e1be2d1936c7d9285486d51b6e95c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 11 May 2018 10:32:50 +0100
Subject: [PATCH] Redirect http to https for nominatim

---
 .../nominatim/templates/default/apache.erb    | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 39fa83289..5cda3e467 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -1,7 +1,6 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<% [80, 443].each do |port| -%>
-<VirtualHost *:<%= port %>>
+<VirtualHost *:443>
     ServerName <%= node[:fqdn] %>
     ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.osm.org
@@ -11,16 +10,11 @@
     ServerAlias nominatim.openmaps.org
     ServerAdmin webmaster@openstreetmap.org
 
-<% if port == 443 -%>
     # Enable SSL
     SSLEngine on
     SSLProxyEngine on
     SSLCertificateFile /etc/ssl/certs/nominatim.openstreetmap.org.pem
     SSLCertificateKeyFile /etc/ssl/private/nominatim.openstreetmap.org.key
-<% else -%>
-    # Redirect ACME challenges for certificate issuance
-    RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-<% end -%>
 
     # Remove Proxy request header to mitigate https://httpoxy.org/
     RequestHeader unset Proxy early
@@ -67,7 +61,21 @@
     RewriteMap bulklist txt:<%= @directory %>/settings/ip_blocks.map
     RewriteRule ^/(search|reverse|lookup)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT]
     RewriteRule ^/details(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|details}/details.php$2 [PT]
-
 </VirtualHost>
 
-<% end -%>
+<VirtualHost *:80>
+    ServerName <%= node[:fqdn] %>
+    ServerAlias nominatim.openstreetmap.org
+    ServerAlias nominatim.osm.org
+    ServerAlias nominatim.openstreetmap.com
+    ServerAlias nominatim.openstreetmap.net
+    ServerAlias nominatim.openstreetmaps.org
+    ServerAlias nominatim.openmaps.org
+    ServerAdmin webmaster@openstreetmap.org
+
+    CustomLog <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log combined
+    ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log
+
+    RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+    RedirectPermanent / https://nominatim.openstreetmap.org/
+</VirtualHost>
-- 
2.43.2