diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-09 19:28:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-09 19:28:41 +0100 |
| commit | 10f6eac581ba46a0c235ae7c97541c7094567e70 (patch) | |
| tree | cff914f134f7e71e9c1cce570e4a8e0320e95877 /src/conf_mode/pki.py | |
| parent | 864524ba86b0a4d57ab64d6e9398c3fd5eb2fce4 (diff) | |
| parent | 07e802a2d3f98cdf29928bf321cc8b89cb41766c (diff) | |
| download | vyos-1x-10f6eac581ba46a0c235ae7c97541c7094567e70.tar.gz vyos-1x-10f6eac581ba46a0c235ae7c97541c7094567e70.zip | |
Merge pull request #2773 from c-po/https-rework-t5766
https: T5902: remove virtual-host configuration
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}) |