From 07c989d8cebaec2caa303c39b099b20f53d67d4d Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 24 Jul 2015 09:15:43 +0200
Subject: [PATCH] Switch to upstream Ejabberd filter

---
 root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service50Ejabberd | 2 +-
 root/etc/fail2ban/filter.d/ejabberd.conf                              | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 root/etc/fail2ban/filter.d/ejabberd.conf

diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service50Ejabberd b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service50Ejabberd
index bae5df6..f9b5f11 100644
--- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service50Ejabberd
+++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service50Ejabberd
@@ -9,7 +9,7 @@ $OUT .=<<"EOF";
 
 [ejabberd]
 enabled  = true
-filter   = ejabberd
+filter   = ejabberd-auth
 logpath  = /var/log/ejabberd.run/current
 action   = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime]
 EOF
diff --git a/root/etc/fail2ban/filter.d/ejabberd.conf b/root/etc/fail2ban/filter.d/ejabberd.conf
deleted file mode 100644
index 9a410c0..0000000
--- a/root/etc/fail2ban/filter.d/ejabberd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-
-failregex =  Failed authentication for .*@.* from IP <HOST>
-ignoreregex =