X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..bd9b2b0eb8b47c6a3ca6617a4dcdf821fde761f0:/cookbooks/fail2ban/recipes/default.rb

diff --git a/cookbooks/fail2ban/recipes/default.rb b/cookbooks/fail2ban/recipes/default.rb
index 50b31d1b3..81bb4cd40 100644
--- a/cookbooks/fail2ban/recipes/default.rb
+++ b/cookbooks/fail2ban/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: fail2ban
+# Cookbook:: fail2ban
 # 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
 #
-#     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,40 +17,28 @@
 # limitations under the License.
 #
 
-package "fail2ban"
-
-if node[:lsb][:release].to_f >= 14.04
-  file "/etc/fail2ban/jail.local" do
-    action :delete
-  end
-else
-  directory "/etc/fail2ban/jail.d" do
-    owner "root"
-    group "root"
-    mode 0o755
-  end
+include_recipe "munin"
 
-  template "/etc/fail2ban/jail.local" do
-    source "jail.local.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-    subscribes :create, "template[/etc/fail2ban/jail.d/00-default.conf]"
-    notifies :reload, "service[fail2ban]"
-  end
-end
+package "fail2ban"
 
 template "/etc/fail2ban/jail.d/00-default.conf" do
   source "jail.default.erb"
   owner "root"
   group "root"
   mode 0o644
-  notifies :reload, "service[fail2ban]"
+  notifies :restart, "service[fail2ban]"
+end
+
+template "/etc/fail2ban/paths-overrides.local" do
+  source "paths-overrides.local.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+  notifies :restart, "service[fail2ban]"
 end
 
 service "fail2ban" do
   action [:enable, :start]
-  supports :status => true, :reload => true, :restart => true
 end
 
 munin_plugin "fail2ban"