From 6e82d5d87f0f7603a9de77f895b3ac3b67323a63 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 15 Aug 2022 20:05:18 +0200
Subject: ocserv: T4333: migrate to new vyos_defined Jinja2 test

---
 data/templates/ocserv/ocserv_config.j2 | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

(limited to 'data')

diff --git a/data/templates/ocserv/ocserv_config.j2 b/data/templates/ocserv/ocserv_config.j2
index 8418a2185..d3d022bb0 100644
--- a/data/templates/ocserv/ocserv_config.j2
+++ b/data/templates/ocserv/ocserv_config.j2
@@ -56,34 +56,25 @@ ban-reset-time = 300
 # The name to use for the tun device
 device = sslvpn
 
-# An alternative way of specifying the network:
-{% if network_settings %}
 # DNS settings
-{%     if network_settings.name_server is string %}
-dns = {{ network_settings.name_server }}
-{%     else %}
-{%         for dns in network_settings.name_server %}
+{% if network_settings.name_server is vyos_defined %}
+{%     for dns in network_settings.name_server %}
 dns = {{ dns }}
-{%         endfor %}
-{%     endif %}
+{%     endfor %}
+{% endif %}
+
 # IPv4 network pool
-{%     if network_settings.client_ip_settings %}
-{%         if network_settings.client_ip_settings.subnet %}
+{% if network_settings.client_ip_settings.subnet is vyos_defined %}
 ipv4-network = {{ network_settings.client_ip_settings.subnet }}
-{%         endif %}
-{%     endif %}
+{% endif %}
+
 # IPv6 network pool
-{%     if network_settings.client_ipv6_pool %}
-{%         if network_settings.client_ipv6_pool.prefix %}
+{% if network_settings.client_ipv6_pool.prefix is vyos_defined %}
 ipv6-network = {{ network_settings.client_ipv6_pool.prefix }}
 ipv6-subnet-prefix = {{ network_settings.client_ipv6_pool.mask }}
-{%         endif %}
-{%     endif %}
 {% endif %}
 
-{% if network_settings.push_route is string %}
-route = {{ network_settings.push_route }}
-{% else %}
+{% if network_settings.push_route is vyos_defined %}
 {%     for route in network_settings.push_route %}
 route = {{ route }}
 {%     endfor %}
-- 
cgit v1.2.3