Merge remote-tracking branch 'tigerfell/pr257'

[chef.git] / cookbooks / fail2ban / resources / jail.rb

diff --git a/cookbooks/fail2ban/resources/jail.rb b/cookbooks/fail2ban/resources/jail.rb
index 4a9b4311128b9a7e60092fb0b1e39011d732bbff..3af0960e9727827687aa9bf1facf715f4fcc13a4 100644 (file)
--- a/cookbooks/fail2ban/resources/jail.rb
+++ b/cookbooks/fail2ban/resources/jail.rb
@@ -1,8 +1,8 @@
 #
 #

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

 # Resource:: fail2ban_jail
 #
 # Resource:: fail2ban_jail
 #

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

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 default_action :create
 

-property :jail, :kind_of => String, :name_attribute => true
+property :jail, :kind_of => String, :name_property => true

 property :filter, :kind_of => String
 property :logpath, :kind_of => String
 property :protocol, :kind_of => String
 property :filter, :kind_of => String
 property :logpath, :kind_of => String
 property :protocol, :kind_of => String


@@ -33,7 +35,7 @@ action :create do
     source "jail.erb"
     owner "root"
     group "root"
     source "jail.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables :name => new_resource.jail,
               :filter => new_resource.filter,
               :logpath => new_resource.logpath,
     variables :name => new_resource.jail,
               :filter => new_resource.filter,
               :logpath => new_resource.logpath,


@@ -51,5 +53,5 @@ action :delete do
 end
 
 def after_created
 end
 
 def after_created

-  notifies :reload, "service[fail2ban]"
+  notifies :restart, "service[fail2ban]"

 end
 end