From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 6 Oct 2020 13:31:04 +0000 (+0200)
Subject: nominatim: add hook for more generic blocks
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e613260d8e47f845ca4d2b48d71d92b42b4aac65?ds=sidebyside

nominatim: add hook for more generic blocks
---

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index e0a7870d5..fd7f49573 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -370,7 +370,7 @@ directory "#{basedir}/etc" do
   mode "775"
 end
 
-%w[user_agent referrer email].each do |name|
+%w[user_agent referrer email generic].each do |name|
   file "#{basedir}/etc/nginx_blocked_#{name}.conf" do
     action :create_if_missing
     owner "nominatim"
diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb
index 2c22ae850..d56d99c8a 100644
--- a/cookbooks/nominatim/templates/default/nginx.erb
+++ b/cookbooks/nominatim/templates/default/nginx.erb
@@ -162,6 +162,7 @@ server {
         { return 403; }
         if ($blocked_email)
         { return 403; }
+        include <%= @confdir %>/nginx_blocked_generic.conf;
 
         limit_req zone=www burst=10;
         limit_req zone=tarpit burst=2;
@@ -183,6 +184,7 @@ server {
         { return 403; }
         if ($blocked_email)
         { return 403; }
+        include <%= @confdir %>/nginx_blocked_generic.conf;
 
         limit_req zone=www burst=10;
         limit_req zone=tarpit burst=2;