X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/004b2d4fea1d51c00896c98fadab13654cf8ff4c..HEAD:/cookbooks/fail2ban/resources/filter.rb

diff --git a/cookbooks/fail2ban/resources/filter.rb b/cookbooks/fail2ban/resources/filter.rb
index 0a13c836a..13a778295 100644
--- 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,12 +17,42 @@
 # limitations under the License.
 #
 
-actions :create, :delete
+unified_mode true
+
 default_action :create
 
-attribute :name, :kind_of => String, :name_attribute => true
-attribute :source, :kind_of => String
+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]
+
+action :create do
+  if new_resource.source
+    remote_file "/etc/fail2ban/filter.d/#{new_resource.filter}.conf" do
+      source new_resource.source
+      owner "root"
+      group "root"
+      mode "644"
+    end
+  else
+    template "/etc/fail2ban/filter.d/#{new_resource.filter}.conf" do
+      cookbook "fail2ban"
+      source "filter.erb"
+      owner "root"
+      group "root"
+      mode "644"
+      variables :failregex => new_resource.failregex,
+                :ignoreregex => new_resource.ignoreregex
+    end
+  end
+end
+
+action :delete do
+  file "/etc/fail2ban/filter.d/#{new_resource.filter}.conf" do
+    action :delete
+  end
+end
 
 def after_created
-  notifies :reload, "service[fail2ban]"
+  notifies :restart, "service[fail2ban]"
 end