diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-09-30 17:20:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-30 17:20:51 +0200 |
| commit | 679c67e53cda6189e8add0d39988304935162071 (patch) | |
| tree | 9d1e3f9528b5e3a0ac6dde57d8cac8b3893bc92f /data | |
| parent | 1bc47f1353bc3930d0d2caf1818cb6019543dada (diff) | |
| parent | de9bba0e97e66d1b1254661f85b9a108518eac76 (diff) | |
| download | vyos-1x-679c67e53cda6189e8add0d39988304935162071.tar.gz vyos-1x-679c67e53cda6189e8add0d39988304935162071.zip | |
Merge pull request #4098 from vyos/mergify/bp/sagitta/pr-4079
syslog: T6719: fix the behavior of "syslog global preserve-fqdn" (backport #4079)
Diffstat (limited to 'data')
| -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 %} |