diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-11-28 14:00:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-28 14:00:42 +0200 |
| commit | f4d46db92f9d95c2264c219304172b7b45094bb3 (patch) | |
| tree | dca004f52a6859681eada179160a56a5b9f61f51 /data | |
| parent | 4c3060b9f0bff246455eaf6704cd14dde444c77d (diff) | |
| parent | a3b37e68379745708981e8f31bc70c0ed9e8239d (diff) | |
| download | vyos-1x-f4d46db92f9d95c2264c219304172b7b45094bb3.tar.gz vyos-1x-f4d46db92f9d95c2264c219304172b7b45094bb3.zip | |
Merge pull request #4824 from alexandr-san4ez/T4251-current
syslog: T4251: Rename "permitted-peers" to "permitted-peer" and improve TLS checks
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/rsyslog/rsyslog.conf.j2 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2 index 9b9153010..714788df0 100644 --- a/data/templates/rsyslog/rsyslog.conf.j2 +++ b/data/templates/rsyslog/rsyslog.conf.j2 @@ -120,9 +120,12 @@ if prifilt("{{ tmp | join(',') }}") then { StreamDriverMode="1" # Select the authentication mode StreamDriverAuthMode="{{ auth_mode if auth_mode == 'anon' else 'x509/' + auth_mode }}" -{% if tls.permitted_peers is vyos_defined and auth_mode in ('fingerprint', 'name') %} +{% if tls.permitted_peer is vyos_defined and auth_mode in ('fingerprint', 'name') %} +{% set permitted_peers = tls.permitted_peer | map('trim') | select | join(',') %} +{% if permitted_peers %} # Only include permitted peers (list of allowed fingerprints or names) - StreamDriverPermittedPeers="{{ tls.permitted_peers }}" + StreamDriverPermittedPeers="{{ permitted_peers }}" +{% endif %} {% endif %} {% if tls.ca_certificate_path is vyos_defined %} # Include the path to the CA certificate file |