From c8ae06b581cbf1a19789500ae15d07a863724272 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 11 Apr 2022 20:58:35 +0200
Subject: system-option: T4333: migrate to new vyos_defined Jinja2 test

---
 data/templates/system/curlrc.tmpl      | 8 +++-----
 data/templates/system/ssh_config.tmpl  | 2 +-
 data/templates/system/sysctl.conf.tmpl | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'data/templates/system')

diff --git a/data/templates/system/curlrc.tmpl b/data/templates/system/curlrc.tmpl
index 3e5ce801c..be4efe8ba 100644
--- a/data/templates/system/curlrc.tmpl
+++ b/data/templates/system/curlrc.tmpl
@@ -1,8 +1,6 @@
-{% if http_client is defined %}
-{%   if http_client.source_interface is defined %}
+{% if http_client.source_interface is vyos_defined %}
 --interface "{{ http_client.source_interface }}"
-{%   endif %}
-{%   if http_client.source_address is defined %}
+{% endif %}
+{% if http_client.source_address is vyos_defined %}
 --interface "{{ http_client.source_address }}"
-{%   endif %}
 {% endif %}
diff --git a/data/templates/system/ssh_config.tmpl b/data/templates/system/ssh_config.tmpl
index abc03f069..1449f95b1 100644
--- a/data/templates/system/ssh_config.tmpl
+++ b/data/templates/system/ssh_config.tmpl
@@ -1,3 +1,3 @@
-{% if ssh_client is defined and ssh_client.source_address is defined and ssh_client.source_address is not none %}
+{% if ssh_client.source_address is vyos_defined %}
 BindAddress {{ ssh_client.source_address }}
 {% endif %}
diff --git a/data/templates/system/sysctl.conf.tmpl b/data/templates/system/sysctl.conf.tmpl
index 72af82ee5..3aa857647 100644
--- a/data/templates/system/sysctl.conf.tmpl
+++ b/data/templates/system/sysctl.conf.tmpl
@@ -1,6 +1,6 @@
 # autogenerated by system_sysctl.py
 
-{% if parameter is defined and parameter is not none %}
+{% if parameter is vyos_defined %}
 {%   for k, v in parameter.items() %}
 {{ k }} = {{ v.value }}
 {%   endfor %}
-- 
cgit v1.2.3