From fb184a0ecf5e4dbb78fd377c983c0fabf5c61dc2 Mon Sep 17 00:00:00 2001 From: Bruno TATU Date: Tue, 4 Jul 2023 15:36:02 +0200 Subject: [PATCH] Set fail2ban_dbpurgeage_default variable for fail2ban --- CHANGELOG.md | 1 + fail2ban/defaults/main.yml | 2 +- fail2ban/tasks/fix-dbpurgeage.yml | 4 ++-- fail2ban/templates/fail2ban_dbpurge.j2 | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ce0a0c2..37bdd103 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * docker-host: added var for user namespace setting * dovecot: fix old_stats plugin for Dovecot 2.3. * dovecot: add Munin plugins dovecot1 and dovecot_stats (patched) +* fail2ban: add default variable fail2ban_dbpurgeage_default ### Changed diff --git a/fail2ban/defaults/main.yml b/fail2ban/defaults/main.yml index bfff9b29..78862cb4 100644 --- a/fail2ban/defaults/main.yml +++ b/fail2ban/defaults/main.yml @@ -47,4 +47,4 @@ fail2ban_roundcube_maxretry: 5 fail2ban_roundcube_bantime: "{{ fail2ban_default_bantime }}" fail2ban_roundcube_findtime: "{{ fail2ban_default_findtime }}" -dbpurgeage_default: "86400 second" +fail2ban_dbpurgeage_default: "86400 second" diff --git a/fail2ban/tasks/fix-dbpurgeage.yml b/fail2ban/tasks/fix-dbpurgeage.yml index 6fa86c91..c24335cd 100644 --- a/fail2ban/tasks/fix-dbpurgeage.yml +++ b/fail2ban/tasks/fix-dbpurgeage.yml @@ -14,12 +14,12 @@ - name: ansible.builtin.set_fact: - dbpurgeage_default : "{{ dbpurgeage.stdout }}" + fail2ban_dbpurgeage_default : "{{ dbpurgeage.stdout }}" when: dbpurgeage.stdout | regex_search("^\\d+\w+$") - name: ansible.builtin.set_fact: - dbpurgeage_default : "{{ dbpurgeage.stdout }} second" + fail2ban_dbpurgeage_default : "{{ dbpurgeage.stdout }} second" when: dbpurgeage.stdout | regex_search("^\\d+$") - name: Add crontab diff --git a/fail2ban/templates/fail2ban_dbpurge.j2 b/fail2ban/templates/fail2ban_dbpurge.j2 index 8b6d9612..44c20f4c 100644 --- a/fail2ban/templates/fail2ban_dbpurge.j2 +++ b/fail2ban/templates/fail2ban_dbpurge.j2 @@ -2,7 +2,7 @@ # Juin - Decembre 2022 : #64088 # Purge pour Stretch et Buster -/usr/bin/ionice -c3 /usr/bin/sqlite3 /var/lib/fail2ban/fail2ban.sqlite3 "DELETE FROM bans WHERE datetime('now', '-{{ dbpurgeage_default }}') > datetime(timeofban, 'unixepoch');" +/usr/bin/ionice -c3 /usr/bin/sqlite3 /var/lib/fail2ban/fail2ban.sqlite3 "DELETE FROM bans WHERE datetime('now', '-{{ fail2ban_dbpurgeage_default }}') > datetime(timeofban, 'unixepoch');" place_dispo=$( df -h /var/lib/fail2ban/fail2ban.sqlite3 --output="avail" -h --block-size=1 |tail -n1 ) place_pris=$( echo $(("$(stat --format %s /var/lib/fail2ban/fail2ban.sqlite3 ) * 2" )) )