diff options
author | Christian Breunig <christian@breunig.cc> | 2025-05-29 20:16:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-05-29 20:16:51 +0200 |
commit | 08dc2e56bf4ad487709ec3849fe97ec24d5b35fe (patch) | |
tree | 9c46650bbe0448accb0fabcf1b980cd598fdebbf /src/conf_mode/pki.py | |
parent | 2ca38e7c8d2487446d64b3ae945705012a2dc742 (diff) | |
parent | 4b4bbd73b84c2c478c7752f58e7f66ec6d90459e (diff) | |
download | vyos-1x-08dc2e56bf4ad487709ec3849fe97ec24d5b35fe.tar.gz vyos-1x-08dc2e56bf4ad487709ec3849fe97ec24d5b35fe.zip |
Merge pull request #4266 from takehaya/T6013-trusted-ca-keys
T6013: Add support for AuthorizedPrincipalsFile to trusted_user_ca_key
Diffstat (limited to 'src/conf_mode/pki.py')
-rwxr-xr-x | src/conf_mode/pki.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/conf_mode/pki.py b/src/conf_mode/pki.py index 869518dd9..7d01b6642 100755 --- a/src/conf_mode/pki.py +++ b/src/conf_mode/pki.py @@ -64,6 +64,10 @@ sync_search = [ 'path': ['service', 'https'], }, { + 'keys': ['key'], + 'path': ['service', 'ssh'], + }, + { 'keys': ['certificate', 'ca_certificate'], 'path': ['interfaces', 'ethernet'], }, @@ -414,7 +418,8 @@ def verify(pki): if 'country' in default_values: country = default_values['country'] if len(country) != 2 or not country.isalpha(): - raise ConfigError(f'Invalid default country value. Value must be 2 alpha characters.') + raise ConfigError('Invalid default country value. '\ + 'Value must be 2 alpha characters.') if 'changed' in pki: # if the list is getting longer, we can move to a dict() and also embed the |