summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-11 15:12:52 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-11 15:12:52 +0200
commit07080afd4015a900fb7474e1c81008f58b478565 (patch)
tree3d879f900b09f1437d8063a594a3c98dcb52008d /data
parentf8e9d1ecea05aa40555b7eb7e337f7fb9e495bae (diff)
downloadvyos-1x-07080afd4015a900fb7474e1c81008f58b478565.tar.gz
vyos-1x-07080afd4015a900fb7474e1c81008f58b478565.zip
vpn: l2tp: T2264: migrate IPv6 prefix node to common CLI style
Combining multiple options into a single CLI node is considered bad practice. IPv6 prefixes consited of the prefix itself and a mask send to the client in one node only. The following CLI parts have been migrated from client-ipv6-pool { delegate-prefix fc00:0:1::/48,64 prefix 2001:db8::/64,64 } to client-ipv6-pool { delegate fc00:0:1::/48 { delegation-prefix 48 } prefix 2001:db8::/48 { mask 64 } } Thus regular validation steps from the VyOS CLI can be used when a prefix is configured.
Diffstat (limited to 'data')
-rw-r--r--data/templates/l2tp/l2tp.config.tmpl8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/l2tp/l2tp.config.tmpl b/data/templates/l2tp/l2tp.config.tmpl
index 0dcff1371..ba78cadcd 100644
--- a/data/templates/l2tp/l2tp.config.tmpl
+++ b/data/templates/l2tp/l2tp.config.tmpl
@@ -118,11 +118,11 @@ ipv6=allow
{% if client_ipv6_pool %}
[ipv6-pool]
-{% for prefix in client_ipv6_pool %}
-{{ prefix }}
+{% for p in client_ipv6_pool %}
+{{ p.prefix }},{{ p.mask }}
{% endfor %}
-{% for prefix in client_ipv6_delegate_prefix %}
-delegate={{ prefix }}
+{% for p in client_ipv6_delegate_prefix %}
+delegate={{ p.prefix }},{{ p.mask }}
{% endfor %}
{% endif %}