From 239ef3124e57471be2847401722aa548a51b6cc4 Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Mon, 8 Jun 2020 13:29:17 +0200
Subject: [PATCH] fail2ban/application: Moved vars to global part

Because paths are not user-configured but given by package/system
---
 group_vars/all/vars.yml                      | 6 ++++++
 roles/fail2ban/application/defaults/main.yml | 7 -------
 roles/fail2ban/application/tasks/main.yml    | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 roles/fail2ban/application/defaults/main.yml

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index ddfe71a..96576c2 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -85,6 +85,12 @@ global_dns_upstream_servers:
 global_dnsmasq_configuration_file: "/etc/dnsmasq.conf"
 global_dnsmasq_configuration_directory: "/etc/dnsmasq.d"
 
+global_fail2ban_system_directory: "/etc/fail2ban"
+global_fail2ban_configuration_directory: "{{ global_fail2ban_system_directory }}/fail2ban.d"
+global_fail2ban_actions_directory: "{{ global_fail2ban_system_directory }}/action.d"
+global_fail2ban_filters_directory: "{{ global_fail2ban_system_directory }}/filter.d"
+global_fail2ban_jails_directory: "{{ global_fail2ban_system_directory }}/jail.d"
+
 global_ip_discover_url: "https://keys.banananet.work/ping"
 global_ip_discover_register_pass: "{{ lookup('password', 'credentials/ip_discover/register_pass chars=digits,ascii_letters length=256') }}"
 
diff --git a/roles/fail2ban/application/defaults/main.yml b/roles/fail2ban/application/defaults/main.yml
deleted file mode 100644
index f2470de..0000000
--- a/roles/fail2ban/application/defaults/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-config_dir: "/etc/fail2ban"
-configuration_directory: "{{ config_dir }}/fail2ban.d"
-actions_directory: "{{ config_dir }}/action.d"
-filters_directory: "{{ config_dir }}/filter.d"
-jails_directory: "{{ config_dir }}/jail.d"
diff --git a/roles/fail2ban/application/tasks/main.yml b/roles/fail2ban/application/tasks/main.yml
index c473098..c6cc8cb 100644
--- a/roles/fail2ban/application/tasks/main.yml
+++ b/roles/fail2ban/application/tasks/main.yml
@@ -14,7 +14,7 @@
 - name: Configure fail2ban
   template:
     src: fail2ban.conf
-    dest: "{{ configuration_directory }}/0_main.local"
+    dest: "{{ global_fail2ban_configuration_directory }}/0_main.local"
     owner: root
     group: root
     mode: u=rw,g=r,o=r
@@ -23,7 +23,7 @@
 - name: Configure sshd jail
   template:
     src: sshd.jail.conf
-    dest: "{{ jails_directory }}/sshd.local"
+    dest: "{{ global_fail2ban_jails_directory }}/sshd.local"
     owner: root
     group: root
     mode: u=rw,g=r,o=r