X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b4c704180591e1acb8de6b1a2c96d91c1665783d..50aea11082eaa90bd37593b9c987d38a082f4e1b:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 6fdafa02e..cade29d31 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -18,13 +18,13 @@
 #
 
 include_recipe "fail2ban"
-include_recipe "munin"
 include_recipe "prometheus"
 include_recipe "ssl"
 
 package %w[
   apache2
   libwww-perl
+  logrotate
 ]
 
 %w[event itk prefork worker].each do |mpm|
@@ -114,7 +114,7 @@ fail2ban_jail "apache-forbidden" do
 end
 
 fail2ban_filter "apache-evasive" do
-  failregex "^Blacklisting address <ADDR>: possible DoS attack\.$"
+  failregex ": Blacklisting address <ADDR>: possible DoS attack\.$"
 end
 
 fail2ban_jail "apache-evasive" do
@@ -126,10 +126,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"