From 9c4e2ea93ca68475bf9871484f2f6787e00677ba Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 25 Oct 2019 20:33:56 +0200
Subject: [PATCH] nominatim: apply direct blocks to http too

---
 cookbooks/nominatim/templates/default/apache.erb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 5cda3e467..9d29290e8 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -76,6 +76,11 @@
     CustomLog <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log combined
     ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log
 
+    RewriteEngine On
+
+    # manual blocks
+    Include <%= @directory %>/settings/apache_blocks.conf
+
     RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
     RedirectPermanent / https://nominatim.openstreetmap.org/
 </VirtualHost>
-- 
2.43.2