diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-11-28 08:25:39 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-11-28 08:25:39 +0100 |
| commit | c87ad948999c28c3c9449f98d60b545481ea29d5 (patch) | |
| tree | 18b188cf73266be95c62f128afe5d155a7a03bf4 /data/templates/syslog | |
| parent | 41f79409c742b6a020318b196cbaa52439845d6d (diff) | |
| download | vyos-1x-c87ad948999c28c3c9449f98d60b545481ea29d5.tar.gz vyos-1x-c87ad948999c28c3c9449f98d60b545481ea29d5.zip | |
vyos.template: T2720: fix remaining in-line time_block syntax
Commit a2ac9fac ("vyos.template: T2720: always enable Jinja2 trim_blocks
feature") globally enabled the trim_blocks feature. Some templates still used
in-line trim_blocks "{%"- or "-%}" which caused miss-placed line endings.
This is fixed by removing all in-line trim_block statememnts of Jinja2 templates.
Diffstat (limited to 'data/templates/syslog')
| -rw-r--r-- | data/templates/syslog/rsyslog.conf.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/syslog/rsyslog.conf.tmpl b/data/templates/syslog/rsyslog.conf.tmpl index a610d132f..10fbb9d3c 100644 --- a/data/templates/syslog/rsyslog.conf.tmpl +++ b/data/templates/syslog/rsyslog.conf.tmpl @@ -1,14 +1,14 @@ ## generated by syslog.py ## ## file based logging -{% if files['global']['marker'] -%} +{% if files['global']['marker'] %} $ModLoad immark {% if files['global']['marker-interval'] %} $MarkMessagePeriod {{files['global']['marker-interval']}} {% endif %} -{% endif -%} -{% if files['global']['preserver_fqdn'] -%} +{% endif %} +{% if files['global']['preserver_fqdn'] %} $PreserveFQDN on -{% endif -%} +{% endif %} {% for file in files %} $outchannel {{file}},{{files[file]['log-file']}},{{files[file]['max-size']}},{{files[file]['action-on-max-size']}} {{files[file]['selectors']}} :omfile:${{file}} |