diff options
| author | Ben Woods <git@ben.woods.am> | 2025-03-21 19:41:18 +0800 |
|---|---|---|
| committer | Ben Woods <git@ben.woods.am> | 2025-03-21 19:41:18 +0800 |
| commit | 39f5da93e538c8a8666d9efcdf702ac4151da319 (patch) | |
| tree | 4e7c63a33606ae510bd05fa67b25671b36e4b6c1 | |
| parent | e906f59f2e89cb5d34bbdfa2ae12a200fb4f93f3 (diff) | |
| download | vyos-1x-39f5da93e538c8a8666d9efcdf702ac4151da319.tar.gz vyos-1x-39f5da93e538c8a8666d9efcdf702ac4151da319.zip | |
syslog: T7270: fix SyslogProtocol23Format typo in rsyslog.conf
| -rw-r--r-- | data/templates/rsyslog/rsyslog.conf.j2 | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_system_syslog.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2 index bf1f76ee4..a67e596fc 100644 --- a/data/templates/rsyslog/rsyslog.conf.j2 +++ b/data/templates/rsyslog/rsyslog.conf.j2 @@ -103,7 +103,7 @@ if prifilt("{{ tmp | join(',') }}") then { port="{{ remote_options.port }}" protocol="{{ remote_options.protocol }}" {% if remote_options.format.include_timezone is vyos_defined %} - template="SyslogProtocol23Format" + template="RSYSLOG_SyslogProtocol23Format" {% endif %} TCP_Framing="{{ 'octet-counted' if remote_options.format.octet_counted is vyos_defined else 'traditional' }}" {% if remote_options.source_address is vyos_defined %} diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py index e2cf1cab8..6eae3f19d 100755 --- a/smoketest/scripts/cli/test_system_syslog.py +++ b/smoketest/scripts/cli/test_system_syslog.py @@ -223,7 +223,7 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase): if 'format' in remote_options: if 'include-timezone' in remote_options['format']: - self.assertIn( ' template="SyslogProtocol23Format"', config) + self.assertIn( ' template="RSYSLOG_SyslogProtocol23Format"', config) if 'octet-counted' in remote_options['format']: self.assertIn( ' TCP_Framing="octet-counted"', config) |