summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorNicolas Vollmar <nvo@scaling.ch>2024-09-24 18:27:29 +0200
committerChristian Breunig <christian@breunig.cc>2024-09-24 18:29:23 +0200
commitc196c6d9207ef112e478f44923b2d0bc8a15b3c9 (patch)
tree86a66edb5857a4e87cb2c9e9df6cf58083300cb6 /data
parent26a9203e95e79afed725cc3bd1f401ae3ffa3707 (diff)
downloadvyos-1x-c196c6d9207ef112e478f44923b2d0bc8a15b3c9.tar.gz
vyos-1x-c196c6d9207ef112e478f44923b2d0bc8a15b3c9.zip
syslog: T6719: fix the behavior of "syslog global preserve-fqdn"
Diffstat (limited to 'data')
-rw-r--r--data/templates/rsyslog/rsyslog.conf.j24
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 %}