diff --git a/config/filter.d/murmur.conf b/config/filter.d/murmur.conf index f5f100a6..efdaf8b5 100644 --- a/config/filter.d/murmur.conf +++ b/config/filter.d/murmur.conf @@ -1,11 +1,6 @@ # Fail2Ban filter for murmur/mumble-server # -[INCLUDES] - -before = common.conf - - [Definition] _daemon = murmurd @@ -15,7 +10,13 @@ _daemon = murmurd # variable in your server config file (murmur.ini / mumble-server.ini). _usernameregex = [^>]+ -_prefix = \s+\d+ => <\d+:%(_usernameregex)s\(-1\)> Rejected connection from :\d+: +# Prefix for systemd-journal (with second date-pattern as optional match): +# +__prefix_journal = (?:\S+\s+%(_daemon)s\[\d+\]:(?:\s+\[\d\-]+ [\d:]+.\d+)?) + +__prefix_line = %(__prefix_journal)s? + +_prefix = %(__prefix_line)s\s+\d+ => <\d+:%(_usernameregex)s\(-1\)> Rejected connection from :\d+: prefregex = ^%(_prefix)s .+$ @@ -26,6 +27,8 @@ ignoreregex = datepattern = ^{DATE} +journalmatch = _SYSTEMD_UNIT=murmurd.service + _COMM=murmurd + # DEV Notes: # # Author: Ross Brown