diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-05-12 20:39:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-12 20:39:43 +0200 |
| commit | 25ddb57b66de2c0918050052a4d374d4edb905f0 (patch) | |
| tree | f69a1c52f65d141b92ef75eb587004758df57477 /data | |
| parent | c60e9c932cab24bcc324f45752f0528332cc69a4 (diff) | |
| parent | 380bc7ddf6b93d66df047e43328693ac0e849c24 (diff) | |
| download | vyos-1x-25ddb57b66de2c0918050052a4d374d4edb905f0.tar.gz vyos-1x-25ddb57b66de2c0918050052a4d374d4edb905f0.zip | |
Merge pull request #2003 from bjw-s/octet_counted
T2778: Fix syslog octet_counted format
Diffstat (limited to 'data')
| -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 0460ae5f0..5352fc367 100644 --- a/data/templates/rsyslog/rsyslog.conf.j2 +++ b/data/templates/rsyslog/rsyslog.conf.j2 @@ -49,7 +49,7 @@ $outchannel {{ file_name }},/var/log/user/{{ file_name }},{{ file_options.archiv {% set _ = tmp.append(facility.replace('all', '*') + '.' + facility_options.level) %} {% endfor %} {% if host_options.protocol is vyos_defined('tcp') %} -{% if host_options.oct_count is vyos_defined %} +{% if host_options.format.octet_counted is vyos_defined %} {{ tmp | join(';') }} @@(o){{ host_name | bracketize_ipv6 }}:{{ host_options.port }};RSYSLOG_SyslogProtocol23Format {% else %} {{ tmp | join(';') }} @@{{ host_name | bracketize_ipv6 }}:{{ host_options.port }} |