From f8e9d1ecea05aa40555b7eb7e337f7fb9e495bae Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 11 Apr 2020 13:12:09 +0200
Subject: vpn: l2tp: T2264: simplify IPv6 config dictionary elements

---
 data/templates/l2tp/l2tp.config.tmpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'data')

diff --git a/data/templates/l2tp/l2tp.config.tmpl b/data/templates/l2tp/l2tp.config.tmpl
index f4746a6a1..0dcff1371 100644
--- a/data/templates/l2tp/l2tp.config.tmpl
+++ b/data/templates/l2tp/l2tp.config.tmpl
@@ -116,18 +116,18 @@ ipv6=allow
 {% endif %}
 
 
-
 {% if client_ipv6_pool %}
 [ipv6-pool]
-{% for prfx in client_ipv6_pool.prefix: %}
-{{prfx}}
+{% for prefix in client_ipv6_pool %}
+{{ prefix }}
 {% endfor %}
-{% for prfx in client_ipv6_pool.delegate_prefix: %}
-delegate={{prfx}}
+{% for prefix in client_ipv6_delegate_prefix %}
+delegate={{ prefix }}
 {% endfor %}
+
 {% endif %}
 
-{% if client_ipv6_pool['delegate_prefix'] %}
+{% if client_ipv6_delegate_prefix %}
 [ipv6-dhcp]
 verbose=1
 {% endif %}
@@ -143,5 +143,5 @@ vendor={{ radius_shaper_vendor }}
 
 [cli]
 tcp=127.0.0.1:2004
-sessions-columns=ifname,username,calling-sid,ip,{{ip6_column}}{{ip6_dp_column}}rate-limit,type,comp,state,rx-bytes,tx-bytes,uptime
+sessions-columns=ifname,username,calling-sid,ip,{{ ip6_column | join(',') }}{{ ',' if ip6_column }}rate-limit,type,comp,state,rx-bytes,tx-bytes,uptime
 
-- 
cgit v1.2.3