From e8a637eec0cc398f78a877ece6b9c7cdca418970 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 13 Apr 2022 22:51:42 +0200
Subject: ipsec: T4333: migrate to new vyos_defined Jinja2 test

---
 data/templates/ipsec/ipsec.conf.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'data/templates/ipsec/ipsec.conf.tmpl')

diff --git a/data/templates/ipsec/ipsec.conf.tmpl b/data/templates/ipsec/ipsec.conf.tmpl
index 1cb531e76..0f7131dff 100644
--- a/data/templates/ipsec/ipsec.conf.tmpl
+++ b/data/templates/ipsec/ipsec.conf.tmpl
@@ -2,7 +2,7 @@
 
 config setup
 {% set charondebug = '' %}
-{% if log is defined and log.subsystem is defined and log.subsystem is not none %}
+{% if log.subsystem is vyos_defined %}
 {%   set subsystem = log.subsystem %}
 {%   if 'any' in log.subsystem %}
 {%     set subsystem = ['dmn', 'mgr', 'ike', 'chd','job', 'cfg', 'knl', 'net', 'asn',
@@ -11,8 +11,8 @@ config setup
 {%   set charondebug = subsystem | join (' ' ~ log.level ~ ', ') ~ ' ' ~ log.level %}
 {% endif %}
     charondebug = "{{ charondebug }}"
-    uniqueids = {{ "no" if disable_uniqreqids is defined else "yes" }}
+    uniqueids = {{ "no" if disable_uniqreqids is vyos_defined else "yes" }}
 
-{%  if include_ipsec_conf is defined %}
+{%  if include_ipsec_conf is vyos_defined %}
 include {{ include_ipsec_conf }}
 {%  endif %}
-- 
cgit v1.2.3