diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-09-25 13:06:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-25 13:06:28 +0100 |
| commit | 298115685900105a57302c879ba47b5420a63d92 (patch) | |
| tree | 49ecbfbf5144e6c8207ff44e387b304ea7fb4119 /data/templates/rsyslog/rsyslog.conf.j2 | |
| parent | 46f83c7d09b923e99a3632b7cc153da08cdded9a (diff) | |
| parent | ea5da8d07d1733207345ec2b736359483f25d7fb (diff) | |
| download | vyos-1x-298115685900105a57302c879ba47b5420a63d92.tar.gz vyos-1x-298115685900105a57302c879ba47b5420a63d92.zip | |
Merge pull request #4097 from vyos/mergify/bp/circinus/pr-4079
syslog: T6719: fix the behavior of "syslog global preserve-fqdn" (backport #4079)
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 97e0ee0b7..0141812ac 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 %} |