summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-04-11 20:58:35 +0200
committerChristian Poessinger <christian@poessinger.com>2022-04-11 20:58:35 +0200
commitc8ae06b581cbf1a19789500ae15d07a863724272 (patch)
tree7f77e5d1f166afe90a4a3ab54a41983c63992185 /data
parent129e7f1d266186e40c715de9481daad25544df2f (diff)
downloadvyos-1x-c8ae06b581cbf1a19789500ae15d07a863724272.tar.gz
vyos-1x-c8ae06b581cbf1a19789500ae15d07a863724272.zip
system-option: T4333: migrate to new vyos_defined Jinja2 test
Diffstat (limited to 'data')
-rw-r--r--data/templates/system/curlrc.tmpl8
-rw-r--r--data/templates/system/ssh_config.tmpl2
-rw-r--r--data/templates/system/sysctl.conf.tmpl2
3 files changed, 5 insertions, 7 deletions
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 %}