summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2025-11-04 16:05:33 +0100
committerGitHub <noreply@github.com>2025-11-04 16:05:33 +0100
commit3c1dfa94dba6fff763a32666683c3bdd35af9bea (patch)
tree40b964e95e5516c5d695c462a3c996523028af92 /src
parent4f9c241db48928f974a32bc6901b9ed4cf2ce20e (diff)
parent01c10334b0b734bef51a5f26a93ef50a635b376a (diff)
downloadvyos-1x-3c1dfa94dba6fff763a32666683c3bdd35af9bea.tar.gz
vyos-1x-3c1dfa94dba6fff763a32666683c3bdd35af9bea.zip
Merge pull request #4829 from c-po/pki-t7976
pki: T7976: calls to node_changed_presence() must use unmangled config paths
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/pki.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/conf_mode/pki.py b/src/conf_mode/pki.py
index f282eea68..6d2817384 100755
--- a/src/conf_mode/pki.py
+++ b/src/conf_mode/pki.py
@@ -83,6 +83,7 @@ sync_search = [
{
'keys': ['certificate', 'ca_certificate'],
'path': ['load_balancing', 'haproxy'],
+ 'orig_path': ['load-balancing', 'haproxy'],
},
{
'keys': ['key'],
@@ -276,11 +277,12 @@ def get_config(config=None):
if isinstance(found_name, str) and found_name != item_name:
continue
- path = search['path']
+ # prefer orig_path over path when unmangling is needed
+ path = search.get('orig_path', search.get('path'))
# Only enable this for debug purposes - otherwise we will always
# print this message for ACME certificates during renew tests -
# even if they are not due for renew!
- # path_str = ' '.join(path + found_path).replace('_','-')
+ # path_str = ' '.join(path + found_path)
# print(f'Updating configuration: "{path_str} {item_name}"')
if path[0] == 'interfaces':