X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b4c704180591e1acb8de6b1a2c96d91c1665783d..200f486870c88f3916ede7bcb36b47b374a63901:/cookbooks/apache/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb index 6fdafa02e..d1a0aac1d 100644 --- a/cookbooks/apache/recipes/default.rb +++ b/cookbooks/apache/recipes/default.rb @@ -18,7 +18,6 @@ # include_recipe "fail2ban" -include_recipe "munin" include_recipe "prometheus" include_recipe "ssl" @@ -114,7 +113,7 @@ fail2ban_jail "apache-forbidden" do end fail2ban_filter "apache-evasive" do - failregex "^Blacklisting address : possible DoS attack\.$" + failregex ": Blacklisting address : possible DoS attack\.$" end fail2ban_jail "apache-evasive" do @@ -126,10 +125,6 @@ fail2ban_jail "apache-evasive" do maxretry 3 end -munin_plugin "apache_accesses" -munin_plugin "apache_processes" -munin_plugin "apache_volume" - template "/var/lib/prometheus/node-exporter/apache.prom" do source "apache.prom.erb" owner "root"