From 8aa7607113316a425751a442d4c3d1256c7dc8aa Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 13 Apr 2022 22:54:12 +0200
Subject: http: api: T4333: migrate to new vyos_defined Jinja2 test

---
 data/templates/https/override.conf.tmpl         | 8 ++++----
 data/templates/https/vyos-http-api.service.tmpl | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/templates/https/override.conf.tmpl b/data/templates/https/override.conf.tmpl
index 824b1ba3b..c2c191b06 100644
--- a/data/templates/https/override.conf.tmpl
+++ b/data/templates/https/override.conf.tmpl
@@ -1,15 +1,15 @@
-{% set vrf_command = 'ip vrf exec ' + vrf + ' ' if vrf is defined else '' %}
+{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' ' if vrf is vyos_defined else '' %}
 [Unit]
 StartLimitIntervalSec=0
 After=vyos-router.service
 
 [Service]
 ExecStartPre=
-ExecStartPre={{vrf_command}}/usr/sbin/nginx -t -q -g 'daemon on; master_process on;'
+ExecStartPre={{ vrf_command }}/usr/sbin/nginx -t -q -g 'daemon on; master_process on;'
 ExecStart=
-ExecStart={{vrf_command}}/usr/sbin/nginx -g 'daemon on; master_process on;'
+ExecStart={{ vrf_command }}/usr/sbin/nginx -g 'daemon on; master_process on;'
 ExecReload=
-ExecReload={{vrf_command}}/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload
+ExecReload={{ vrf_command }}/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload
 Restart=always
 RestartPreventExitStatus=
 RestartSec=10
diff --git a/data/templates/https/vyos-http-api.service.tmpl b/data/templates/https/vyos-http-api.service.tmpl
index 15bd80d65..fb424e06c 100644
--- a/data/templates/https/vyos-http-api.service.tmpl
+++ b/data/templates/https/vyos-http-api.service.tmpl
@@ -1,11 +1,11 @@
-{% set vrf_command = 'ip vrf exec ' + vrf + ' ' if vrf is defined else '' %}
+{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' ' if vrf is vyos_defined else '' %}
 [Unit]
 Description=VyOS HTTP API service
 After=vyos-router.service
 Requires=vyos-router.service
 
 [Service]
-ExecStart={{vrf_command}}/usr/libexec/vyos/services/vyos-http-api-server
+ExecStart={{ vrf_command }}/usr/libexec/vyos/services/vyos-http-api-server
 Type=idle
 
 SyslogIdentifier=vyos-http-api
-- 
cgit v1.2.3