X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..573da82d342b0197451448a59a239dfd8908d359:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index de0155165..f424061af 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -327,19 +327,25 @@ apache_module "proxy_fcgi"
 apache_module "proxy_http"
 apache_module "headers"
 
-service "php7.0-fpm" do
+php_version = if node[:lsb][:release].to_f >= 18.04
+                "7.2"
+              else
+                "7.0"
+              end
+
+service "php#{php_version}-fpm" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|
-  template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do
+  template "/etc/php/#{php_version}/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables data.merge(:name => name)
-    notifies :reload, "service[php7.0-fpm]"
+    notifies :reload, "service[php#{php_version}-fpm]"
   end
 end
 
@@ -372,17 +378,6 @@ end
 
 include_recipe "fail2ban"
 
-fail2ban_filter "nominatim" do
-  failregex "Warning ignored: <HOST>"
-end
-
-fail2ban_jail "nominatim" do
-  filter "nominatim"
-  logpath "#{node[:nominatim][:logdir]}/restricted_ips.log"
-  ports [80, 443]
-  maxretry 3
-end
-
 munin_plugin_conf "nominatim" do
   template "munin.erb"
   variables :db => node[:nominatim][:dbname],