Switch culebre, fafnir, ladon and trogdor to squid 4

[chef.git] / cookbooks / nominatim / templates / default / apache.erb

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 5cda3e4674e3233ec714c375261c6170f4139ad3..9d29290e817f050441ecaffe10469a50e9588457 100644 (file)
--- 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
 
     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>
     RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
     RedirectPermanent / https://nominatim.openstreetmap.org/
 </VirtualHost>