diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-03-04 16:12:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-04 16:12:10 +0100 |
| commit | 99d929d18d7380cdf906ac2126ad8587059450fe (patch) | |
| tree | aa1a93fc87af8fc0491ad15caab20fa339617d7c /data/templates | |
| parent | a4ba60b63993ab693b8d75baef40a8339af0611d (diff) | |
| parent | cf99d54870da341c1b7b3af58f102e26c16ce379 (diff) | |
| download | vyos-1x-99d929d18d7380cdf906ac2126ad8587059450fe.tar.gz vyos-1x-99d929d18d7380cdf906ac2126ad8587059450fe.zip | |
Merge pull request #4377 from vyos/syslog-typos-T6989
syslog: T6989: fix typos and add option to disable MARK
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/rsyslog/rsyslog.conf.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2 index c6eb6430c..e2ff334ff 100644 --- a/data/templates/rsyslog/rsyslog.conf.j2 +++ b/data/templates/rsyslog/rsyslog.conf.j2 @@ -40,7 +40,7 @@ global(workDirectory="/var/spool/rsyslog") # Send emergency messages to all logged-in users *.emerg action(type="omusrmsg" users="*") -{% if marker is vyos_defined %} +{% if marker is vyos_defined and marker.disable is not vyos_defined %} # Load the immark module for periodic --MARK-- message capability module(load="immark" interval="{{ marker.interval }}") {% endif %} |