diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-09-24 18:31:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-24 18:31:47 +0200 |
| commit | 9661e27d8bda3873370f7ae9bb6c42da3376bed1 (patch) | |
| tree | 86a66edb5857a4e87cb2c9e9df6cf58083300cb6 /data/templates/rsyslog/rsyslog.conf.j2 | |
| parent | 26a9203e95e79afed725cc3bd1f401ae3ffa3707 (diff) | |
| parent | c196c6d9207ef112e478f44923b2d0bc8a15b3c9 (diff) | |
| download | vyos-1x-9661e27d8bda3873370f7ae9bb6c42da3376bed1.tar.gz vyos-1x-9661e27d8bda3873370f7ae9bb6c42da3376bed1.zip | |
Merge pull request #4079 from nvollmar/T6719
syslog: T6719: fix the behavior of "syslog global preserve-fqdn"
Diffstat (limited to 'data/templates/rsyslog/rsyslog.conf.j2')
| -rw-r--r-- | data/templates/rsyslog/rsyslog.conf.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2 index effc2ea14..7fd592d1f 100644 --- a/data/templates/rsyslog/rsyslog.conf.j2 +++ b/data/templates/rsyslog/rsyslog.conf.j2 @@ -10,6 +10,10 @@ $MarkMessagePeriod {{ global.marker.interval }} $PreserveFQDN on {% endif %} +{% if global.local_host_name is vyos_defined %} +$LocalHostName {{ global.local_host_name }} +{% endif %} + # We always log to /var/log/messages $outchannel global,/var/log/messages,262144,/usr/sbin/logrotate {{ logrotate }} {% if global.facility is vyos_defined %} |