diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-10 11:21:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-10 11:21:13 +0100 |
| commit | 7a03e2b0ab1d66b9f73b02c5333bff38fb35e258 (patch) | |
| tree | ac710f5ee08eb5f05be8561feb51c86547d37d44 /src/conf_mode/pki.py | |
| parent | a9ed12de93425a9e9637a61e5b7f17ae01575242 (diff) | |
| parent | 1f236a3ca73164a6f861a99113bf844ec9b99b06 (diff) | |
| download | vyos-1x-7a03e2b0ab1d66b9f73b02c5333bff38fb35e258.tar.gz vyos-1x-7a03e2b0ab1d66b9f73b02c5333bff38fb35e258.zip | |
Merge pull request #2781 from vyos/mergify/bp/sagitta/pr-2773
https: T5902: remove virtual-host configuration (backport #2773)
Diffstat (limited to 'src/conf_mode/pki.py')
| -rwxr-xr-x | src/conf_mode/pki.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/conf_mode/pki.py b/src/conf_mode/pki.py index 239e44c3b..4be40e99e 100755 --- a/src/conf_mode/pki.py +++ b/src/conf_mode/pki.py @@ -130,28 +130,27 @@ def get_config(config=None): if len(argv) > 1 and argv[1] == 'certbot_renew': pki['certbot_renew'] = {} - tmp = node_changed(conf, base + ['ca'], key_mangling=('-', '_'), recursive=True) + tmp = node_changed(conf, base + ['ca'], recursive=True) if tmp: if 'changed' not in pki: pki.update({'changed':{}}) pki['changed'].update({'ca' : tmp}) - tmp = node_changed(conf, base + ['certificate'], key_mangling=('-', '_'), recursive=True) + tmp = node_changed(conf, base + ['certificate'], recursive=True) if tmp: if 'changed' not in pki: pki.update({'changed':{}}) pki['changed'].update({'certificate' : tmp}) - tmp = node_changed(conf, base + ['dh'], key_mangling=('-', '_'), recursive=True) + tmp = node_changed(conf, base + ['dh'], recursive=True) if tmp: if 'changed' not in pki: pki.update({'changed':{}}) pki['changed'].update({'dh' : tmp}) - tmp = node_changed(conf, base + ['key-pair'], key_mangling=('-', '_'), recursive=True) + tmp = node_changed(conf, base + ['key-pair'], recursive=True) if tmp: if 'changed' not in pki: pki.update({'changed':{}}) pki['changed'].update({'key_pair' : tmp}) - tmp = node_changed(conf, base + ['openvpn', 'shared-secret'], key_mangling=('-', '_'), - recursive=True) + tmp = node_changed(conf, base + ['openvpn', 'shared-secret'], recursive=True) if tmp: if 'changed' not in pki: pki.update({'changed':{}}) pki['changed'].update({'openvpn' : tmp}) |