Merge remote-tracking branch 'github/pull/704'

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 6fdafa02ef2a9a83f8c127d87d61234ba7145ba0..d1a0aac1dd45c70e56a30b071c64ebcfde31b864 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -18,7 +18,6 @@
 #
 
 include_recipe "fail2ban"
 #
 
 include_recipe "fail2ban"

-include_recipe "munin"

 include_recipe "prometheus"
 include_recipe "ssl"
 
 include_recipe "prometheus"
 include_recipe "ssl"
 


@@ -114,7 +113,7 @@ fail2ban_jail "apache-forbidden" do
 end
 
 fail2ban_filter "apache-evasive" 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
 end
 
 fail2ban_jail "apache-evasive" do


@@ -126,10 +125,6 @@ fail2ban_jail "apache-evasive" do
   maxretry 3
 end
 
   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"
 template "/var/lib/prometheus/node-exporter/apache.prom" do
   source "apache.prom.erb"
   owner "root"