Teach munin to use internal addresses for Amsterdam machines

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

diff --git a/cookbooks/fail2ban/recipes/default.rb b/cookbooks/fail2ban/recipes/default.rb
index 1fe3840cce1e58e3c2c82d39c6352f396013f06a..3e15e20dace8a8655be89148a92a0613f98996e9 100644 (file)
--- a/cookbooks/fail2ban/recipes/default.rb
+++ b/cookbooks/fail2ban/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,16 +19,17 @@
 
 package "fail2ban"
 
 
 package "fail2ban"
 

-template "/etc/fail2ban/jail.local" do
-  source "jail.erb"
+template "/etc/fail2ban/jail.d/00-default.conf" do
+  source "jail.default.erb"

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode 0644
-  variables :jails => []
+  mode 0o644
+  notifies :reload, "service[fail2ban]"

 end
 
 service "fail2ban" do
 end
 
 service "fail2ban" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :reload => true, :restart => true
   supports :status => true, :reload => true, :restart => true

-  subscribes :reload, "template[/etc/fail2ban/jail.local]"

 end
 end

+
+munin_plugin "fail2ban"