X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/96ec481d8fc8db85b44daee8d87889d8fce909d4..9b2abddf2004a1424175886a6e853304717cb0fe:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index a4591d1ee..05227bb46 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -177,6 +177,7 @@ git source_directory do
   enable_submodules true
   user "nominatim"
   group "nominatim"
+  not_if { node[:nominatim][:state] != "slave" && File.exist?("#{source_directory}/README.md") }
   notifies :run, "execute[compile_nominatim]", :immediately
 end
 
@@ -251,7 +252,9 @@ template "/etc/cron.d/nominatim" do
   owner "root"
   group "root"
   mode "0644"
-  variables :bin_directory => "#{source_directory}/utils", :mailto => email_errors
+  variables :bin_directory => "#{source_directory}/utils",
+            :mailto => email_errors,
+            :update_maintenance_trigger => "#{basedir}/status/update_maintenance"
 end
 
 template "#{source_directory}/utils/nominatim-update" do
@@ -263,7 +266,8 @@ template "#{source_directory}/utils/nominatim-update" do
             :srcdir => source_directory,
             :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
-            :update_stop_file => "#{basedir}/status/updates_disabled"
+            :update_stop_file => "#{basedir}/status/updates_disabled",
+            :update_maintenance_trigger => "#{basedir}/status/update_maintenance"
 end
 
 template "/etc/init.d/nominatim-update" do
@@ -366,24 +370,6 @@ template "/etc/logrotate.d/apache2" do
   mode 0o644
 end
 
-include_recipe "fail2ban"
-
-web_servers = search(:node, "recipes:web\\:\\:frontend").collect do |n| # ~FC010
-  n.ipaddresses(:role => :external)
-end.flatten
-
-fail2ban_filter "nominatim" do
-  failregex '^<HOST> - - \[\] "[^"]+" (408|429) '
-end
-
-fail2ban_jail "nominatim" do
-  filter "nominatim"
-  logpath "/var/log/apache2/nominatim.openstreetmap.org-access.log"
-  ports [80, 443]
-  maxretry 100
-  ignoreips web_servers
-end
-
 munin_plugin_conf "nominatim" do
   template "munin.erb"
   variables :db => node[:nominatim][:dbname],