From 255662b31a48d13e20b9c90833ff2fdcbe58c5c9 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 26 Apr 2020 17:12:21 -0400
Subject: reorganize fail2ban files

---
 modules/fail2ban/files/jail/nginx-botsearch.conf | 3 +++
 modules/fail2ban/files/jail/sshd.conf            | 3 +++
 modules/fail2ban/files/nginx-botsearch.conf      | 3 ---
 modules/fail2ban/files/sshd.conf                 | 3 ---
 modules/fail2ban/manifests/jail.pp               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 modules/fail2ban/files/jail/nginx-botsearch.conf
 create mode 100644 modules/fail2ban/files/jail/sshd.conf
 delete mode 100644 modules/fail2ban/files/nginx-botsearch.conf
 delete mode 100644 modules/fail2ban/files/sshd.conf

(limited to 'modules/fail2ban')

diff --git a/modules/fail2ban/files/jail/nginx-botsearch.conf b/modules/fail2ban/files/jail/nginx-botsearch.conf
new file mode 100644
index 0000000..6389ef6
--- /dev/null
+++ b/modules/fail2ban/files/jail/nginx-botsearch.conf
@@ -0,0 +1,3 @@
+[nginx-botsearch]
+enabled = true
+logpath = /var/log/nginx/*.log
diff --git a/modules/fail2ban/files/jail/sshd.conf b/modules/fail2ban/files/jail/sshd.conf
new file mode 100644
index 0000000..8e3b6f6
--- /dev/null
+++ b/modules/fail2ban/files/jail/sshd.conf
@@ -0,0 +1,3 @@
+[sshd]
+enabled = true
+ignoreip = 10.19.49.0/24
diff --git a/modules/fail2ban/files/nginx-botsearch.conf b/modules/fail2ban/files/nginx-botsearch.conf
deleted file mode 100644
index 6389ef6..0000000
--- a/modules/fail2ban/files/nginx-botsearch.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[nginx-botsearch]
-enabled = true
-logpath = /var/log/nginx/*.log
diff --git a/modules/fail2ban/files/sshd.conf b/modules/fail2ban/files/sshd.conf
deleted file mode 100644
index 8e3b6f6..0000000
--- a/modules/fail2ban/files/sshd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[sshd]
-enabled = true
-ignoreip = 10.19.49.0/24
diff --git a/modules/fail2ban/manifests/jail.pp b/modules/fail2ban/manifests/jail.pp
index 7e8083e..2d3c2ef 100644
--- a/modules/fail2ban/manifests/jail.pp
+++ b/modules/fail2ban/manifests/jail.pp
@@ -2,7 +2,7 @@ define fail2ban::jail($source=undef) {
   include fail2ban
 
   $_source = $source ? {
-    undef => "puppet:///modules/fail2ban/${name}.conf",
+    undef => "puppet:///modules/fail2ban/jail/${name}.conf",
     default => $source,
   }
 
-- 
cgit v1.2.3-54-g00ecf