Update rubocop configuration for COP renames

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

diff --git a/cookbooks/fail2ban/recipes/default.rb b/cookbooks/fail2ban/recipes/default.rb
index b06ea2a452d2ba2f213a92e632c0d6bbe5370474..81bb4cd4023bbf6a5f246f75b43d8452c0158917 100644 (file)
--- a/cookbooks/fail2ban/recipes/default.rb
+++ b/cookbooks/fail2ban/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: fail2ban
+# Cookbook:: fail2ban

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,


@@ -17,20 +17,28 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "munin"
+

 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"
+  mode 0o644
+  notifies :restart, "service[fail2ban]"
+end
+
+template "/etc/fail2ban/paths-overrides.local" do
+  source "paths-overrides.local.erb"

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

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

 end
 
 service "fail2ban" do
   action [:enable, :start]
 end
 
 service "fail2ban" do
   action [:enable, :start]

-  supports :status => true, :reload => true, :restart => true
-  subscribes :reload, "template[/etc/fail2ban/jail.local]"

 end
 
 munin_plugin "fail2ban"
 end
 
 munin_plugin "fail2ban"