nominatim: ban IPs that repeatedly send bad requests

[chef.git] / cookbooks / nominatim / recipes / default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 3f8b814590a4b05ee2ff1ba350b72c5064782f6d..22947a06d94514e3ad2d7745e9b19abffc1799a5 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -20,14 +20,13 @@
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
-directory "#{basedir}" do
+directory basedir do
   owner "nominatim"
   group "nominatim"
   mode 0o755
   recursive true
 end
 
-
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"
@@ -294,7 +293,7 @@ file "#{build_directory}/settings/ip_blocks.map" do
   mode 0o664
 end
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "php"
 package "php-fpm"
@@ -308,30 +307,32 @@ apache_module "proxy_fcgi"
 apache_module "proxy_http"
 apache_module "headers"
 
-service "php5-fpm" do
-  if node[:lsb][:release].to_f >= 15.10
-    provider Chef::Provider::Service::Systemd
-    service_name "php7.0-fpm"
-  elsif node[:lsb][:release].to_f >= 14.04
-    provider Chef::Provider::Service::Upstart
-  end
+service "php7.0-fpm" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
-php_confdir = node[:lsb][:release].to_f >= 15.10 ? "/etc/php/7.0" : "/etc/php5"
-
 node[:nominatim][:fpm_pools].each do |name, data|
-  template "#{php_confdir}/fpm/pool.d/#{name}.conf" do
+  template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables data.merge(:name => name)
-    notifies :reload, "service[php5-fpm]"
+    notifies :reload, "service[php7.0-fpm]"
   end
 end
 
+ssl_certificate "nominatim.openstreetmap.org" do
+  domains ["nominatim.openstreetmap.org",
+           "nominatim.osm.org",
+           "nominatim.openstreetmap.com",
+           "nominatim.openstreetmap.net",
+           "nominatim.openstreetmaps.org",
+           "nominatim.openmaps.org"]
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   directory build_directory
@@ -352,7 +353,7 @@ end
 include_recipe "fail2ban"
 
 fail2ban_filter "nominatim" do
-  failregex '^<HOST> - - \[[^]]+\] "[^"]+" 429 '
+  failregex '^<HOST> - - \[\] "[^"]+" (400|429) '
 end
 
 fail2ban_jail "nominatim" do