summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2021-12-01 11:49:22 -0600
committerJohn Estabrook <jestabro@vyos.io>2021-12-01 15:38:26 -0600
commitf2bdd26c36e7074d093e001656bc649b7c7426d3 (patch)
treef91e146878db830c10637c5268370719d7bb2ae3
parent9f6ca1e489c0498bfa90ca027d1d7419d4e422b8 (diff)
downloadvyos-1x-f2bdd26c36e7074d093e001656bc649b7c7426d3.tar.gz
vyos-1x-f2bdd26c36e7074d093e001656bc649b7c7426d3.zip
http-api: T3440: simplify vyos-http-api initialization
-rwxr-xr-xsrc/conf_mode/http-api.py2
-rw-r--r--src/systemd/vyos-http-api.service6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/conf_mode/http-api.py b/src/conf_mode/http-api.py
index 7e4b117c8..4bfcbeb47 100755
--- a/src/conf_mode/http-api.py
+++ b/src/conf_mode/http-api.py
@@ -100,7 +100,7 @@ def apply(http_api):
call('systemctl stop vyos-http-api.service')
# Let uvicorn settle before restarting Nginx
- time.sleep(2)
+ time.sleep(1)
cmd(f'{vyos_conf_scripts_dir}/https.py', raising=ConfigError)
diff --git a/src/systemd/vyos-http-api.service b/src/systemd/vyos-http-api.service
index ba5df5984..55370b356 100644
--- a/src/systemd/vyos-http-api.service
+++ b/src/systemd/vyos-http-api.service
@@ -1,10 +1,9 @@
[Unit]
Description=VyOS HTTP API service
-After=auditd.service systemd-user-sessions.service time-sync.target vyos-router.service
+After=vyos-router.service
Requires=vyos-router.service
[Service]
-ExecStartPre=/usr/libexec/vyos/init/vyos-config
ExecStart=/usr/libexec/vyos/services/vyos-http-api-server
Type=idle
@@ -18,6 +17,5 @@ User=root
Group=vyattacfg
[Install]
-# Installing in a earlier target leaves ExecStartPre waiting
-WantedBy=getty.target
+WantedBy=vyos.target