10 files changed, 56 insertions, 58 deletions
diff --git a/data/templates/accel-ppp/chap-secrets.config_dict.tmpl b/data/templates/accel-ppp/chap-secrets.config_dict.tmpl
index da64b64d5..d4e8bb2aa 100644
--- a/data/templates/accel-ppp/chap-secrets.config_dict.tmpl
+++ b/data/templates/accel-ppp/chap-secrets.config_dict.tmpl
@@ -1,12 +1,10 @@
 # username  server  password  acceptable local IP addresses   shaper
-{% if authentication is defined and authentication.local_users is defined and authentication.local_users.username is defined %}
-{%   for user, user_config in authentication.local_users.username.items() %}
-{%     if user_config.disabled is not defined %}
-{%       if user_config.rate_limit is defined %}
+{% if authentication.local_users.username is vyos_defined %}
+{%   for user, user_config in authentication.local_users.username.items() if user_config.disabled is not vyos_defined %}
+{%     if user_config.rate_limit is vyos_defined %}
 {{ "%-12s" | format(user) }} * {{ "%-16s" | format(user_config.password) }} {{ "%-16s" | format(user_config.static_ip) }} {{ user_config.rate_limit.download }}/{{ user_config.rate_limit.upload }}
-{%       else %}
+{%     else %}
 {{ "%-12s" | format(user) }} * {{ "%-16s" | format(user_config.password) }} {{ "%-16s" | format(user_config.static_ip) }}
-{%       endif %}
 {%     endif %}
 {%   endfor %}
 {% endif %}
diff --git a/data/templates/accel-ppp/config_chap_secrets_radius.j2 b/data/templates/accel-ppp/config_chap_secrets_radius.j2
index 49af3a228..1b28dbe46 100644
--- a/data/templates/accel-ppp/config_chap_secrets_radius.j2
+++ b/data/templates/accel-ppp/config_chap_secrets_radius.j2
@@ -1,33 +1,33 @@
-{% if authentication.mode is defined and authentication.mode == 'local' %}
+{% if authentication.mode is vyos_defined('local') %}
 [chap-secrets]
 chap-secrets={{ chap_secrets_file }}
-{% elif authentication.mode is defined and authentication.mode == 'radius' %}
+{% elif authentication.mode is vyos_defined('radius') %}
 [radius]
 verbose=1
-{%   for server, options in authentication.radius.server.items() if not options.disable is defined %}
+{%   for server, options in authentication.radius.server.items() if not options.disable is vyos_defined %}
 server={{ server }},{{ options.key }},auth-port={{ options.port }},acct-port={{ options.acct_port }},req-limit=0,fail-time={{ options.fail_time }}
 {%   endfor %}
-{%   if authentication.radius.acct_interim_jitter is defined and authentication.radius.acct_interim_jitter is not none %}
+{%   if authentication.radius.acct_interim_jitter is vyos_defined %}
 acct-interim-jitter={{ authentication.radius.acct_interim_jitter }}
 {%   endif %}
 acct-timeout={{ authentication.radius.acct_timeout }}
 timeout={{ authentication.radius.timeout }}
 max-try={{ authentication.radius.max_try }}
-{%   if authentication.radius.nas_identifier is defined and authentication.radius.nas_identifier is not none %}
+{%   if authentication.radius.nas_identifier is vyos_defined %}
 nas-identifier={{ authentication.radius.nas_identifier }}
 {%   endif %}
-{%   if authentication.radius.nas_ip_address is defined and authentication.radius.nas_ip_address is not none %}
+{%   if authentication.radius.nas_ip_address is vyos_defined %}
 nas-ip-address={{ authentication.radius.nas_ip_address }}
 {%   endif %}
-{%   if authentication.radius.source_address is defined and authentication.radius.source_address is not none %}
+{%   if authentication.radius.source_address is vyos_defined %}
 bind={{ authentication.radius.source_address }}
 {%   endif %}
-{%   if authentication.radius.dynamic_author.server is defined and authentication.radius.dynamic_author.server is not none %}
+{%   if authentication.radius.dynamic_author.server is vyos_defined %}
 dae-server={{ authentication.radius.dynamic_author.server }}:{{ authentication.radius.dynamic_author.port }},{{ authentication.radius.dynamic_author.key }}
 {%   endif %}
 {% endif %}
 {# Both chap-secrets and radius block required the gw-ip-address #}
-{% if gateway_address is defined and gateway_address is not none %}
+{% if gateway_address is vyos_defined %}
 gw-ip-address={{ gateway_address }}
 {% endif %}
 
diff --git a/data/templates/accel-ppp/config_ip_pool.j2 b/data/templates/accel-ppp/config_ip_pool.j2
index 3b0f68084..ec1c77112 100644
--- a/data/templates/accel-ppp/config_ip_pool.j2
+++ b/data/templates/accel-ppp/config_ip_pool.j2
@@ -1,12 +1,12 @@
-{% if client_ip_pool is defined and client_ip_pool is not none %}
+{% if client_ip_pool is vyos_defined %}
 [ip-pool]
-{%   if gateway_address is defined and gateway_address is not none %}
+{%   if gateway_address is vyos_defined %}
 gw-ip-address={{ gateway_address }}
 {%   endif %}
-{%   if client_ip_pool.start is defined and client_ip_pool.stop is defined and client_ip_pool.start is not none and client_ip_pool.stop is not none %}
+{%   if client_ip_pool.start is vyos_defined and client_ip_pool.stop is vyos_defined %}
 {{ client_ip_pool.start }}-{{ client_ip_pool.stop.split('.')[3] }}
 {%   endif %}
-{%   if client_ip_pool.subnet is defined and client_ip_pool.subnet is not none %}
+{%   if client_ip_pool.subnet is vyos_defined %}
 {%     for subnet in client_ip_pool.subnet %}
 {{ subnet }}
 {%     endfor %}
diff --git a/data/templates/accel-ppp/config_ipv6_pool.j2 b/data/templates/accel-ppp/config_ipv6_pool.j2
index f45bf9442..99a930fb2 100644
--- a/data/templates/accel-ppp/config_ipv6_pool.j2
+++ b/data/templates/accel-ppp/config_ipv6_pool.j2
@@ -1,19 +1,19 @@
-{% if client_ipv6_pool is defined and client_ipv6_pool is not none %}
+{% if client_ipv6_pool is vyos_defined %}
 [ipv6-nd]
 AdvAutonomousFlag=1
 
-{%   if client_ipv6_pool.prefix is defined and client_ipv6_pool.prefix is not none %}
+{%   if client_ipv6_pool.prefix is vyos_defined %}
 [ipv6-pool]
 {%     for prefix, options in client_ipv6_pool.prefix.items() %}
 {{ prefix }},{{ options.mask }}
 {%     endfor %}
-{%     if client_ipv6_pool.delegate is defined and client_ipv6_pool.delegate is not none %}
+{%     if client_ipv6_pool.delegate is vyos_defined %}
 {%       for prefix, options in client_ipv6_pool.delegate.items() %}
 delegate={{ prefix }},{{ options.delegation_prefix }}
 {%       endfor %}
 {%     endif %}
 {%   endif %}
-{%   if client_ipv6_pool.delegate is defined and client_ipv6_pool.delegate is not none %}
+{%   if client_ipv6_pool.delegate is vyos_defined %}
 [ipv6-dhcp]
 verbose=1
 {%   endif %}
diff --git a/data/templates/accel-ppp/config_modules_auth_mode.j2 b/data/templates/accel-ppp/config_modules_auth_mode.j2
index e3d578b38..3fb8a011f 100644
--- a/data/templates/accel-ppp/config_modules_auth_mode.j2
+++ b/data/templates/accel-ppp/config_modules_auth_mode.j2
@@ -1,5 +1,5 @@
-{% if authentication is defined and authentication.mode is defined and authentication.mode == 'local' %}
+{% if authentication.mode is vyos_defined('local') %}
 chap-secrets
-{% elif authentication is defined and authentication.mode is defined and authentication.mode == 'radius' %}
+{% elif authentication.mode is vyos_defined('radius') %}
 radius
 {% endif %}
diff --git a/data/templates/accel-ppp/config_modules_ipv6.j2 b/data/templates/accel-ppp/config_modules_ipv6.j2
index 02740ce7c..6174779a5 100644
--- a/data/templates/accel-ppp/config_modules_ipv6.j2
+++ b/data/templates/accel-ppp/config_modules_ipv6.j2
@@ -1,4 +1,4 @@
-{% if ppp_options.ipv6 is defined and ppp_options.ipv6 != 'deny' %}
+{% if ppp_options.ipv6 is vyos_defined and ppp_options.ipv6 is not vyos_defined('deny') %}
 ipv6pool
 ipv6_nd
 ipv6_dhcp
diff --git a/data/templates/accel-ppp/config_name_server.j2 b/data/templates/accel-ppp/config_name_server.j2
index 2bf064f92..4b4b5fb68 100644
--- a/data/templates/accel-ppp/config_name_server.j2
+++ b/data/templates/accel-ppp/config_name_server.j2
@@ -1,11 +1,11 @@
-{% if name_server_ipv4 is defined and name_server_ipv4 is not none %}
+{% if name_server_ipv4 is vyos_defined %}
 [dns]
 {%   for ns in name_server_ipv4 %}
 dns{{ loop.index }}={{ ns }}
 {%   endfor %}
 {% endif %}
 
-{% if name_server_ipv6 is defined and name_server_ipv6 is not none %}
+{% if name_server_ipv6 is vyos_defined %}
 [ipv6-dns]
 {%   for ns in name_server_ipv6 %}
 {{ ns }}
diff --git a/data/templates/accel-ppp/config_shaper_radius.j2 b/data/templates/accel-ppp/config_shaper_radius.j2
index 8de5f5df3..cf8b4871b 100644
--- a/data/templates/accel-ppp/config_shaper_radius.j2
+++ b/data/templates/accel-ppp/config_shaper_radius.j2
@@ -1,9 +1,9 @@
-{% if authentication is defined and authentication.mode is defined and authentication.mode == 'radius' %}
-{%   if authentication is defined and authentication.radius is defined and authentication.radius.rate_limit is defined and authentication.radius.rate_limit.enable is defined %}
+{% if authentication.mode is vyos_defined('radius') %}
+{%   if authentication.radius.rate_limit.enable is vyos_defined %}
 [shaper]
 verbose=1
 attr={{ authentication.radius.rate_limit.attribute }}
-{%     if authentication.radius.rate_limit.vendor is defined and authentication.radius.rate_limit.vendor is not none %}
+{%     if authentication.radius.rate_limit.vendor is vyos_defined %}
 vendor={{ authentication.radius.rate_limit.vendor }}
 {%     endif %}
 {%   endif %}
diff --git a/data/templates/accel-ppp/pppoe.config.tmpl b/data/templates/accel-ppp/pppoe.config.tmpl
index 0a8e0079b..81b98cc81 100644
--- a/data/templates/accel-ppp/pppoe.config.tmpl
+++ b/data/templates/accel-ppp/pppoe.config.tmpl
@@ -11,13 +11,13 @@ ippool
 {# Common authentication protocols (pap, chap ...) #}
 {% include 'accel-ppp/config_modules_auth_protocols.j2' %}
 
-{% if snmp is defined %}
+{% if snmp is vyos_defined %}
 net-snmp
 {% endif %}
-{% if limits is defined %}
+{% if limits is vyos_defined %}
 connlimit
 {% endif %}
-{% if extended_scripts is defined %}
+{% if extended_scripts is vyos_defined %}
 sigchld
 pppd_compat
 {% endif %}
@@ -30,7 +30,7 @@ syslog=accel-pppoe,daemon
 copy=1
 level=5
 
-{% if snmp is defined and snmp.master_agent is defined %}
+{% if snmp.master_agent is vyos_defined %}
 [snmp]
 master=1
 {% endif %}
@@ -47,7 +47,7 @@ disable
 {# Common DNS name-server definition #}
 {% include 'accel-ppp/config_name_server.j2' %}
 
-{% if wins_server is defined and wins_server is not none %}
+{% if wins_server is vyos_defined %}
 [wins]
 {%   for server in wins_server %}
 wins{{ loop.index }}={{ server }}
@@ -57,7 +57,7 @@ wins{{ loop.index }}={{ server }}
 {# Common chap-secrets and RADIUS server/option definitions #}
 {% include 'accel-ppp/config_chap_secrets_radius.j2' %}
 
-{% if session_control is defined and session_control != 'disable' %}
+{% if session_control is vyos_defined and session_control is not vyos_defined('disable') %}
 [common]
 single-session={{ session_control }}
 {% endif %}
@@ -65,37 +65,37 @@ single-session={{ session_control }}
 [ppp]
 verbose=1
 check-ip=1
-ccp={{ "1" if ppp_options.ccp is defined else "0" }}
-unit-preallocate={{ "1" if authentication.radius.preallocate_vif is defined else "0" }}
-{% if ppp_options.min_mtu is defined and ppp_options.min_mtu is not none %}
+ccp={{ "1" if ppp_options.ccp is vyos_defined else "0" }}
+unit-preallocate={{ "1" if authentication.radius.preallocate_vif is vyos_defined else "0" }}
+{% if ppp_options.min_mtu is vyos_defined %}
 min-mtu={{ ppp_options.min_mtu }}
 {% else %}
 min-mtu={{ mtu }}
 {% endif %}
-{% if ppp_options.mru is defined and ppp_options.mru is not none %}
+{% if ppp_options.mru is vyos_defined %}
 mru={{ ppp_options.mru }}
 {% endif %}
 mppe={{ ppp_options.mppe }}
 lcp-echo-interval={{ ppp_options.lcp_echo_interval }}
 lcp-echo-timeout={{ ppp_options.lcp_echo_timeout }}
 lcp-echo-failure={{ ppp_options.lcp_echo_failure }}
-{% if ppp_options.ipv4 is defined and ppp_options.ipv4 is not none %}
+{% if ppp_options.ipv4 is vyos_defined %}
 ipv4={{ ppp_options.ipv4 }}
 {% endif %}
 {# IPv6 #}
-{% if ppp_options.ipv6 is defined and ppp_options.ipv6 is not none %}
+{% if ppp_options.ipv6 is vyos_defined %}
 ipv6={{ ppp_options.ipv6 }}
-{%   if ppp_options.ipv6_intf_id is defined and ppp_options.ipv6_intf_id is not none %}
+{%   if ppp_options.ipv6_intf_id is vyos_defined %}
 ipv6-intf-id={{ ppp_options.ipv6_intf_id }}
 {%   endif %}
-{%   if ppp_options.ipv6_peer_intf_id is defined and ppp_options.ipv6_peer_intf_id is not none %}
+{%   if ppp_options.ipv6_peer_intf_id is vyos_defined %}
 ipv6-peer-intf-id={{ ppp_options.ipv6_peer_intf_id }}
 {%   endif %}
-ipv6-accept-peer-intf-id={{ "1" if ppp_options.ipv6_accept_peer_intf_id is defined else "0" }}
+ipv6-accept-peer-intf-id={{ "1" if ppp_options.ipv6_accept_peer_intf_id is vyos_defined else "0" }}
 {% endif %}
 {# MTU #}
 mtu={{ mtu }}
-{% if ppp_options.interface_cache is defined and ppp_options.interface_cache is not none %}
+{% if ppp_options.interface_cache is vyos_defined %}
 unit-cache={{ ppp_options.interface_cache }}
 {% endif %}
 
@@ -103,18 +103,18 @@ unit-cache={{ ppp_options.interface_cache }}
 verbose=1
 ac-name={{ access_concentrator }}
 
-{% if interface is defined and interface is not none %}
+{% if interface is vyos_defined %}
 {%   for iface, iface_config in interface.items() %}
-{%     if iface_config.vlan_id is not defined and iface_config.vlan_range is not defined %}
+{%     if iface_config.vlan_id is not vyos_defined and iface_config.vlan_range is not vyos_defined %}
 interface={{ iface }}
 {%     endif %}
-{%     if iface_config.vlan_range is defined %}
+{%     if iface_config.vlan_range is vyos_defined %}
 {%       for regex in iface_config.regex %}
 interface=re:^{{ iface | replace('.', '\\.') }}\.({{ regex }})$
 {%       endfor %}
 vlan-mon={{ iface }},{{ iface_config.vlan_range | join(',') }}
 {%     endif %}
-{%     if iface_config.vlan_id is defined %}
+{%     if iface_config.vlan_id is vyos_defined %}
 {%       for vlan in iface_config.vlan_id %}
 vlan-mon={{ iface }},{{ vlan }}
 interface=re:^{{ iface | replace('.', '\\.') }}\.{{ vlan }}$
@@ -138,19 +138,19 @@ service-name={{ service_name | join(',') }}
 {%   endfor %}
 pado-delay={{ pado_delay_param.value }}
 {% endif %}
-{% if authentication.radius.called_sid_format is defined and authentication.radius.called_sid_format is not none %}
+{% if authentication.radius.called_sid_format is vyos_defined %}
 called-sid={{ authentication.radius.called_sid_format }}
 {% endif %}
 
-{% if limits is defined %}
+{% if limits is vyos_defined %}
 [connlimit]
-{%   if limits.connection_limit is defined and limits.connection_limit is not none %}
+{%   if limits.connection_limit is vyos_defined %}
 limit={{ limits.connection_limit }}
 {%   endif %}
-{%   if limits.burst is defined and limits.burst %}
+{%   if limits.burst is vyos_defined %}
 burst={{ limits.burst }}
 {%   endif %}
-{%   if limits.timeout is defined and limits.timeout is not none %}
+{%   if limits.timeout is vyos_defined %}
 timeout={{ limits.timeout }}
 {%   endif %}
 {% endif %}
@@ -158,7 +158,7 @@ timeout={{ limits.timeout }}
 {# Common RADIUS shaper configuration #}
 {% include 'accel-ppp/config_shaper_radius.j2' %}
 
-{% if extended_scripts is defined %}
+{% if extended_scripts is vyos_defined %}
 [pppd-compat]
 verbose=1
 radattr-prefix=/run/accel-pppd/radattr
diff --git a/data/templates/accel-ppp/sstp.config.tmpl b/data/templates/accel-ppp/sstp.config.tmpl
index 8fd7d230d..5c6f19306 100644
--- a/data/templates/accel-ppp/sstp.config.tmpl
+++ b/data/templates/accel-ppp/sstp.config.tmpl
@@ -50,7 +50,7 @@ verbose=1
 check-ip=1
 {# MTU #}
 mtu={{ mtu }}
-ipv6={{ 'allow' if ppp_options.ipv6 == "deny" and client_ipv6_pool is defined else ppp_options.ipv6 }}
+ipv6={{ 'allow' if ppp_options.ipv6 is vyos_defined("deny") and client_ipv6_pool is vyos_defined else ppp_options.ipv6 }}
 ipv4={{ ppp_options.ipv4 }}
 
 mppe={{ ppp_options.mppe }}