diff options
| author | John Estabrook <jestabro@vyos.io> | 2021-12-01 11:49:22 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2021-12-01 15:52:18 -0600 |
| commit | efbb2930dcc78ea1f870b5ae5467f1a576bbf08c (patch) | |
| tree | 0a24febea1fcbd685c96328ad5c697b34e3d49f2 | |
| parent | d7a1d1d90e66d3a300b3056d4dc3556194aa9834 (diff) | |
| download | vyos-1x-efbb2930dcc78ea1f870b5ae5467f1a576bbf08c.tar.gz vyos-1x-efbb2930dcc78ea1f870b5ae5467f1a576bbf08c.zip | |
http-api: T3440: simplify vyos-http-api initialization
(cherry picked from commit f2bdd26c36e7074d093e001656bc649b7c7426d3)
| -rwxr-xr-x | src/conf_mode/http-api.py | 2 | ||||
| -rw-r--r-- | src/systemd/vyos-http-api.service | 6 |
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 |