summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-11-08 17:32:45 +0000
committerGitHub <noreply@github.com>2024-11-08 17:32:45 +0000
commitff82bd5cfd1719c31f8169309566e5c8e8d43571 (patch)
treed9bdf5902d2a90eb338080469d346600fd0df809 /data/templates
parenta975403041cdff799faf0f07690c539633ac38a7 (diff)
parent9ba81b263f4e0dd7b5dbf2e766702eedff96538b (diff)
downloadvyos-1x-current.tar.gz
vyos-1x-current.zip
Merge pull request #4185 from c-po/syslog-fixupHEADcurrent
syslog: T6858: bugfix remote syslog using TCP
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/rsyslog/rsyslog.conf.j22
1 files changed, 0 insertions, 2 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2
index 7fd592d1f..253a4bee2 100644
--- a/data/templates/rsyslog/rsyslog.conf.j2
+++ b/data/templates/rsyslog/rsyslog.conf.j2
@@ -57,9 +57,7 @@ $outchannel {{ file_name }},/var/log/user/{{ file_name }},{{ file_options.archiv
{% endfor %}
{% endif %}
{% if host_options.protocol is vyos_defined('tcp') %}
-{% if host_options.format.octet_counted is vyos_defined %}
{{ tmp | join(';') }} @@{{ '(o)' if host_options.format.octet_counted is vyos_defined }}{{ host_name | bracketize_ipv6 }}:{{ host_options.port }}{{ ';RSYSLOG_SyslogProtocol23Format' if host_options.format.include_timezone is vyos_defined }}
-{% endif %}
{% else %}
{{ tmp | join(';') }} @{{ host_name | bracketize_ipv6 }}:{{ host_options.port }}{{ ';RSYSLOG_SyslogProtocol23Format' if host_options.format.include_timezone is vyos_defined }}
{% endif %}