diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-12-26 12:16:27 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-12-26 12:17:11 +0100 |
| commit | f2ce2d66537e83b9859d70fea043f82089222104 (patch) | |
| tree | 8e6630a48796c77eca0b7ff07987d910520f9677 | |
| parent | f4f19d33b5568fe14117b0c55fc4ccf423541730 (diff) | |
| download | vyos-1x-f2ce2d66537e83b9859d70fea043f82089222104.tar.gz vyos-1x-f2ce2d66537e83b9859d70fea043f82089222104.zip | |
config: T8124: make get_config_dict() pki={} node purely optional
Automatic parsing and integration of the PKI subsystem into the resulting
config dict is now enabled by passing with_pki=True to get_config_dict().
However, when no PKI configuration is present, the resulting dictionary still
includes an empty PKI key. This is undesirable; we should only include keys in
the dictionary when they contain relevant data.
| -rw-r--r-- | python/vyos/config.py | 2 | ||||
| -rw-r--r-- | src/conf_mode/load-balancing_haproxy.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/python/vyos/config.py b/python/vyos/config.py index e14ada2ae..0476d7945 100644 --- a/python/vyos/config.py +++ b/python/vyos/config.py @@ -363,7 +363,7 @@ class Config(object): pki_dict['certificate'][certificate] = config_dict_mangle_acme( certificate, pki_dict['certificate'][certificate]) - conf_dict['pki'] = pki_dict + conf_dict['pki'] = pki_dict interfaces_root = root_dict.get('interfaces', {}) setattr(conf_dict, 'interfaces_root', interfaces_root) diff --git a/src/conf_mode/load-balancing_haproxy.py b/src/conf_mode/load-balancing_haproxy.py index 4c26ed0b4..b5509f526 100644 --- a/src/conf_mode/load-balancing_haproxy.py +++ b/src/conf_mode/load-balancing_haproxy.py @@ -127,7 +127,7 @@ def verify(lb): def generate(lb): if not lb: - # Delete /run/haproxy/haproxy.cfg + # Delete generated config files config_files = [load_balancing_conf_file, systemd_override] for file in config_files: if os.path.isfile(file): @@ -142,8 +142,8 @@ def generate(lb): if not os.path.isdir(load_balancing_dir): os.mkdir(load_balancing_dir) - loaded_ca_certs = {load_certificate(c['certificate']) - for c in lb['pki']['ca'].values()} if 'ca' in lb['pki'] else {} + loaded_ca_certs = {load_certificate(cert_data['certificate']) + for _, cert_data in dict_search('pki.ca', lb, default={}).items()} # SSL Certificates for frontend for front, front_config in lb['service'].items(): |