Modernise more LWRPs

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 53529704c4d137be93541b1d4c50803231f75fb0..6141b65d9df82a93bd1d23843a7f0fe15db17977 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -370,26 +370,8 @@ 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 "#{node[:nominatim][:logdir]}/nominatim.openstreetmap.org-access.log"
-  ports [80, 443]
-  maxretry 100
-  ignoreips web_servers
-end
-
 munin_plugin_conf "nominatim" do
-  template "munin.erb"
+  template_source "munin.erb"
   variables :db => node[:nominatim][:dbname],
             :querylog => "#{node[:nominatim][:logdir]}/query.log"
 end