ipsec: T4333: migrate to new vyos_defined Jinja2 test

1 files changed, 8 insertions, 8 deletions

diff --git a/data/templates/ipsec/swanctl/remote_access.tmpl b/data/templates/ipsec/swanctl/remote_access.tmpl
index 6354c60b1..059984139 100644
--- a/data/templates/ipsec/swanctl/remote_access.tmpl
+++ b/data/templates/ipsec/swanctl/remote_access.tmpl
@@ -4,21 +4,21 @@
 {%   set esp = esp_group[rw_conf.esp_group] %}
     ra-{{ name }} {
         remote_addrs = %any
-        local_addrs = {{ rw_conf.local_address if rw_conf.local_address is defined else '%any' }}
+        local_addrs = {{ rw_conf.local_address if rw_conf.local_address is vyos_defined else '%any' }}
         proposals = {{ ike_group[rw_conf.ike_group] | get_esp_ike_cipher | join(',') }}
-        version = {{ ike.key_exchange[4:] if ike is defined and ike.key_exchange is defined else "0" }}
+        version = {{ ike.key_exchange[4:] if ike.key_exchange is vyos_defined else "0" }}
         send_certreq = no
         rekey_time = {{ ike.lifetime }}s
         keyingtries = 0
-{%   if rw_conf.unique is defined and rw_conf.unique is not none %}
+{%   if rw_conf.unique is vyos_defined %}
         unique = {{ rw_conf.unique }}
 {%   endif %}
-{%   if rw_conf.pool is defined and rw_conf.pool is not none %}
+{%   if rw_conf.pool is vyos_defined %}
         pools = {{ rw_conf.pool | join(',') }}
 {%   endif %}
         local {
-{%   if rw_conf.authentication.id is defined and rw_conf.authentication.use_x509_id is not defined %}
-            id = "{{ rw_conf.authentication.id }}"
+{%   if rw_conf.authentication.id is vyos_defined and rw_conf.authentication.use_x509_id is not vyos_defined %}
+            id = '{{ rw_conf.authentication.id }}'
 {%   endif %}
 {%   if rw_conf.authentication.server_mode == 'x509' %}
             auth = pubkey
@@ -40,8 +40,8 @@
                 rand_time = 540s
                 dpd_action = clear
                 inactivity = {{ rw_conf.timeout }}
-{%   set local_prefix = rw_conf.local.prefix if rw_conf.local is defined and rw_conf.local.prefix is defined else ['0.0.0.0/0', '::/0'] %}
-{%   set local_port = rw_conf.local.port if rw_conf.local is defined and rw_conf.local.port is defined else '' %}
+{%   set local_prefix = rw_conf.local.prefix if rw_conf.local.prefix is vyos_defined else ['0.0.0.0/0', '::/0'] %}
+{%   set local_port = rw_conf.local.port if rw_conf.local.port is vyos_defined else '' %}
 {%   set local_suffix = '[%any/{1}]'.format(local_port) if local_port else '' %}
                 local_ts = {{ local_prefix | join(local_suffix + ",") }}{{ local_suffix }}
             }