summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2022-12-02 12:36:15 -0600
committerGitHub <noreply@github.com>2022-12-02 12:36:15 -0600
commit8cdc6aea127c455c0aef36ab6d93ec050cbf04aa (patch)
tree01df16653d4e2af609930d0a846ec46585747d66 /src
parentc2a5957a942c8f6070b8f6ff12764e90c1a4c237 (diff)
parent579e9294075d82627997af41ac7895923c7e8d5d (diff)
downloadvyos-1x-8cdc6aea127c455c0aef36ab6d93ec050cbf04aa.tar.gz
vyos-1x-8cdc6aea127c455c0aef36ab6d93ec050cbf04aa.zip
Merge pull request #1689 from jestabro/config-script-dependency
http-api: T4859: correct calling of script dependencies from http-api.py
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/http-api.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/conf_mode/http-api.py b/src/conf_mode/http-api.py
index be80613c6..6328294c1 100755
--- a/src/conf_mode/http-api.py
+++ b/src/conf_mode/http-api.py
@@ -25,6 +25,7 @@ import vyos.defaults
from vyos.config import Config
from vyos.configdict import dict_merge
+from vyos.configdep import set_dependents, call_dependents
from vyos.template import render
from vyos.util import cmd
from vyos.util import call
@@ -61,6 +62,11 @@ def get_config(config=None):
else:
conf = Config()
+ # reset on creation/deletion of 'api' node
+ https_base = ['service', 'https']
+ if conf.exists(https_base):
+ set_dependents("https", conf)
+
base = ['service', 'https', 'api']
if not conf.exists(base):
return None
@@ -132,7 +138,7 @@ def apply(http_api):
# Let uvicorn settle before restarting Nginx
sleep(1)
- cmd(f'{vyos_conf_scripts_dir}/https.py', raising=ConfigError)
+ call_dependents()
if __name__ == '__main__':
try: