From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 25 Oct 2019 18:33:56 +0000 (+0200)
Subject: nominatim: apply direct blocks to http too
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/9c4e2ea93ca68475bf9871484f2f6787e00677ba

nominatim: apply direct blocks to http too
---

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>