diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-11 13:12:09 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-11 13:12:12 +0200 |
| commit | f8e9d1ecea05aa40555b7eb7e337f7fb9e495bae (patch) | |
| tree | 2f88a212abb6092e3057e8918b8d6de777631045 /data/templates | |
| parent | 13510cac5a4aadc3f6ca79c8c7fd7276abe95be3 (diff) | |
| download | vyos-1x-f8e9d1ecea05aa40555b7eb7e337f7fb9e495bae.tar.gz vyos-1x-f8e9d1ecea05aa40555b7eb7e337f7fb9e495bae.zip | |
vpn: l2tp: T2264: simplify IPv6 config dictionary elements
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/l2tp/l2tp.config.tmpl | 14 |
1 files changed, 7 insertions, 7 deletions
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 |