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 /interface-definitions | |
| 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 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/version/system-version.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/system_syslog.xml.in | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/interface-definitions/include/version/system-version.xml.i b/interface-definitions/include/version/system-version.xml.i index 5cdece74a..a9987e8e4 100644 --- a/interface-definitions/include/version/system-version.xml.i +++ b/interface-definitions/include/version/system-version.xml.i @@ -1,3 +1,3 @@ <!-- include start from include/version/system-version.xml.i --> -<syntaxVersion component='system' version='29'></syntaxVersion> +<syntaxVersion component='system' version='30'></syntaxVersion> <!-- include end --> diff --git a/interface-definitions/system_syslog.xml.in b/interface-definitions/system_syslog.xml.in index 4acbc729d..221b4320f 100644 --- a/interface-definitions/system_syslog.xml.in +++ b/interface-definitions/system_syslog.xml.in @@ -86,7 +86,7 @@ </valueHelp> <valueHelp> <format>fingerprint</format> - <description>Authenticate peer by matching its certificate fingerprint to a configured, permitted list (`permitted-peers` option)</description> + <description>Authenticate peer by matching its certificate fingerprint to a configured, permitted list (`permitted-peer` option)</description> </valueHelp> <valueHelp> <format>certvalid</format> @@ -94,7 +94,7 @@ </valueHelp> <valueHelp> <format>name</format> - <description>Authenticate peer by verifying its certificate subject name against a configured value (`permitted-peers` option)</description> + <description>Authenticate peer by verifying its certificate subject name against a configured value (`permitted-peer` option)</description> </valueHelp> <constraint> <regex>(anon|fingerprint|certvalid|name)</regex> @@ -102,13 +102,14 @@ </properties> <defaultValue>anon</defaultValue> </leafNode> - <leafNode name="permitted-peers"> + <leafNode name="permitted-peer"> <properties> - <help>Comma-separated list of allowed peer certificate fingerprints or subject names</help> + <help>Allowed peer certificate fingerprint or subject name</help> <valueHelp> <format>txt</format> - <description>Comma-separated fingerprints or peer names.\nFor example:\n - 'SHA1:DD:23:E3:E7:70:F5:B4:13:44:16:78:A5:5A:8C:39:48:53:A6:DD:25,SHA256:10:C4:26:1D:CB:3C:AB:12:DB:1A:F0:47:37:AE:6D:D2:DE:66:B5:71:B7:2E:5B:BB:AE:0C:7E:7F:5F:0D:E9:64'\n - 'logs.example.com'</description> + <description>Peer fingerprint - SHA1:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX or subject name - logs.example.com</description> </valueHelp> + <multi/> </properties> </leafNode> </children> |