summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorsebres <serg.brester@sebres.de>2020-09-23 19:39:50 +0200
committersebres <serg.brester@sebres.de>2020-09-23 19:39:50 +0200
commitd253e60a8bf21c97f0168b41cc1e188926bb100e (patch)
treefd5ce641dcc6dd921df87c130267bf57ea529fb2 /man
parent74b73bce8a2c7a49d4bf16713bbbc47cdb7f3047 (diff)
parent24093de32daa05af5f178639095ac7106d55b544 (diff)
downloadfail2ban-d253e60a8bf21c97f0168b41cc1e188926bb100e.tar.gz
Merge branch '0.10' into 0.11
Diffstat (limited to 'man')
-rw-r--r--man/fail2ban-regex.19
-rw-r--r--man/jail.conf.59
2 files changed, 15 insertions, 3 deletions
diff --git a/man/fail2ban-regex.1 b/man/fail2ban-regex.1
index cb187c2a..d122aebc 100644
--- a/man/fail2ban-regex.1
+++ b/man/fail2ban-regex.1
@@ -18,13 +18,18 @@ a string representing a log line
filename
path to a log file (\fI\,/var/log/auth.log\/\fP)
.TP
-"systemd\-journal"
-search systemd journal (systemd\-python required)
+systemd\-journal
+search systemd journal (systemd\-python required),
+optionally with backend parameters, see `man jail.conf`
+for usage and examples (systemd\-journal[journalflags=1]).
.SS "REGEX:"
.TP
string
a string representing a 'failregex'
.TP
+filter
+name of filter, optionally with options (sshd[mode=aggressive])
+.TP
filename
path to a filter file (filter.d/sshd.conf)
.SS "IGNOREREGEX:"
diff --git a/man/jail.conf.5 b/man/jail.conf.5
index 830c8aed..d7722124 100644
--- a/man/jail.conf.5
+++ b/man/jail.conf.5
@@ -298,7 +298,14 @@ requires Gamin (a file alteration monitor) to be installed. If Gamin is not inst
uses a polling algorithm which does not require external libraries.
.TP
.B systemd
-uses systemd python library to access the systemd journal. Specifying \fBlogpath\fR is not valid for this backend and instead utilises \fBjournalmatch\fR from the jails associated filter config.
+uses systemd python library to access the systemd journal. Specifying \fBlogpath\fR is not valid for this backend and instead utilises \fBjournalmatch\fR from the jails associated filter config. Multiple systemd-specific flags can be passed to the backend, including \fBjournalpath\fR and \fBjournalfiles\fR, to explicitly set the path to a directory or set of files. \fBjournalflags\fR, which by default is 4 and excludes user session files, can be set to include them with \fBjournalflags=1\fR, see the python-systemd documentation for other settings and further details. Examples:
+.PP
+.RS
+.nf
+backend = systemd[journalpath=/run/log/journal/machine-1]
+backend = systemd[journalfiles="/path/to/system.journal, /path/to/user.journal"]
+backend = systemd[journalflags=1]
+.fi
.SS Actions
Each jail can be configured with only a single filter, but may have multiple actions. By default, the name of a action is the action filename, and in the case of Python actions, the ".py" file extension is stripped. Where multiple of the same action are to be used, the \fBactname\fR option can be assigned to the action to avoid duplication e.g.: