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

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

diff --git a/cookbooks/fail2ban/resources/filter.rb b/cookbooks/fail2ban/resources/filter.rb
index 940716d26af81167d00b9bb51d71699658ba0fa0..13a7782950875e3929df01f5fc5027ffc22392d7 100644 (file)
--- a/cookbooks/fail2ban/resources/filter.rb
+++ b/cookbooks/fail2ban/resources/filter.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: fail2ban
+# Cookbook:: fail2ban
 # Resource:: fail2ban_filter
 #
-# 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.
 # 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,
@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
-property :filter, :kind_of => String, :name_attribute => true
+property :filter, :kind_of => String, :name_property => true
 property :source, :kind_of => String
 property :failregex, :kind_of => [String, Array]
 property :ignoreregex, :kind_of => [String, Array]
@@ -30,7 +32,7 @@ action :create do
       source new_resource.source
       owner "root"
       group "root"
-      mode 0o644
+      mode "644"
     end
   else
     template "/etc/fail2ban/filter.d/#{new_resource.filter}.conf" do
@@ -38,7 +40,7 @@ action :create do
       source "filter.erb"
       owner "root"
       group "root"
-      mode 0o644
+      mode "644"
       variables :failregex => new_resource.failregex,
                 :ignoreregex => new_resource.ignoreregex
     end
@@ -52,5 +54,5 @@ action :delete do
 end
 
 def after_created
-  notifies :reload, "service[fail2ban]"
+  notifies :restart, "service[fail2ban]"
 end