diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-10-24 21:28:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-24 21:28:11 +0200 |
| commit | d316d808669994c4528b67a651fe0559a4b3dc77 (patch) | |
| tree | 94ed873f180c340abc64c0ce9d9ee387697ab485 /src | |
| parent | c284938df61b5e970dd13cde03e0693254e89211 (diff) | |
| parent | 34ce34f1680a5c34a68aa7a9774107e7bb2b7610 (diff) | |
| download | vyos-1x-d316d808669994c4528b67a651fe0559a4b3dc77.tar.gz vyos-1x-d316d808669994c4528b67a651fe0559a4b3dc77.zip | |
Merge pull request #4809 from alexandr-san4ez/T4251-current
syslog: T4251: Fix TLS enablement logic for syslog
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/system_syslog.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/conf_mode/system_syslog.py b/src/conf_mode/system_syslog.py index 82be09e4f..76999f311 100755 --- a/src/conf_mode/system_syslog.py +++ b/src/conf_mode/system_syslog.py @@ -52,7 +52,7 @@ def _cleanup_tls_certs(): def _remote_has_tls(remote_options): - return 'tls' in remote_options and 'enable' in remote_options['tls'] + return 'tls' in remote_options def _verify_tls_remote_options(remote, remote_options, syslog): @@ -138,6 +138,11 @@ def get_config(config=None): tmp = conf.return_value(['system', 'domain-name']) syslog['preserve_fqdn']['domain_name'] = tmp + # prune 'remote <remote> tls' if it was not set by user + for remote in syslog.get('remote', {}): + if syslog.from_defaults(['remote', remote, 'tls']): + del syslog['remote'][remote]['tls'] + return syslog def verify(syslog): |