diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-04 11:17:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-04 11:17:27 +0100 |
| commit | 598fed91068401d5ed259ea742820248d851d246 (patch) | |
| tree | 14ad877fe86882f8325f6bda83471197aecc6c45 /src/conf_mode/load-balancing_reverse-proxy.py | |
| parent | 1cc70ce273cbddb5ea9eb4148808c6c2aaf3d28f (diff) | |
| parent | 706fdbb234202723e02f93ad8eb724649181a60a (diff) | |
| download | vyos-1x-598fed91068401d5ed259ea742820248d851d246.tar.gz vyos-1x-598fed91068401d5ed259ea742820248d851d246.zip | |
Merge pull request #2751 from vyos/mergify/bp/sagitta/pr-2750
configdict: T5894: add get_config_dict() flag with_pki (backport #2750)
Diffstat (limited to 'src/conf_mode/load-balancing_reverse-proxy.py')
| -rwxr-xr-x | src/conf_mode/load-balancing_reverse-proxy.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/conf_mode/load-balancing_reverse-proxy.py b/src/conf_mode/load-balancing_reverse-proxy.py index 333ebc66c..7338fe573 100755 --- a/src/conf_mode/load-balancing_reverse-proxy.py +++ b/src/conf_mode/load-balancing_reverse-proxy.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2023 VyOS maintainers and contributors +# Copyright (C) 2023-2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -43,17 +43,14 @@ def get_config(config=None): conf = Config() base = ['load-balancing', 'reverse-proxy'] + if not conf.exists(base): + return None lb = conf.get_config_dict(base, get_first_key=True, key_mangling=('-', '_'), - no_tag_node_value_mangle=True) - - if lb: - lb['pki'] = conf.get_config_dict(['pki'], key_mangling=('-', '_'), - get_first_key=True, no_tag_node_value_mangle=True) - - if lb: - lb = conf.merge_defaults(lb, recursive=True) + no_tag_node_value_mangle=True, + with_recursive_defaults=True, + with_pki=True) return lb |