Add https support for git.osm.org

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index b10c9232737db54cc1507c0dd3bb1f6b5ce24bd8..d667db3cfe90d3d9cf061e1ef358f4e90a3e7a68 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -252,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
@@ -264,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
@@ -369,20 +372,15 @@ 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) '
+  failregex "Warning ignored: <HOST>"
 end
 
 fail2ban_jail "nominatim" do
   filter "nominatim"
-  logpath "/var/log/apache2/nominatim.openstreetmap.org-access.log"
+  logpath "#{node[:nominatim][:logdir]}/restricted_ips.log"
   ports [80, 443]
-  maxretry 100
-  ignoreips web_servers
+  maxretry 3
 end
 
 munin_plugin_conf "nominatim" do