summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-18 12:35:10 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-18 14:31:51 +0200
commit901d5e89ec6e3fb0f3d13f90f0495a4dda592454 (patch)
tree6a18d5bcbfa1fbdf7d83d1ba828a7641ac694af5 /data
parent3a81e26a23b5e1b372bfa15c63dbc725a2f448ed (diff)
downloadvyos-1x-901d5e89ec6e3fb0f3d13f90f0495a4dda592454.tar.gz
vyos-1x-901d5e89ec6e3fb0f3d13f90f0495a4dda592454.zip
pppoe-server: T2314: migrate IPv6 to common CLI nodes with embeeded validation
Diffstat (limited to 'data')
-rw-r--r--data/templates/l2tp/l2tp.config.tmpl1
-rw-r--r--data/templates/pppoe-server/pppoe.config.tmpl8
2 files changed, 4 insertions, 5 deletions
diff --git a/data/templates/l2tp/l2tp.config.tmpl b/data/templates/l2tp/l2tp.config.tmpl
index ba78cadcd..84f544203 100644
--- a/data/templates/l2tp/l2tp.config.tmpl
+++ b/data/templates/l2tp/l2tp.config.tmpl
@@ -124,7 +124,6 @@ ipv6=allow
{% for p in client_ipv6_delegate_prefix %}
delegate={{ p.prefix }},{{ p.mask }}
{% endfor %}
-
{% endif %}
{% if client_ipv6_delegate_prefix %}
diff --git a/data/templates/pppoe-server/pppoe.config.tmpl b/data/templates/pppoe-server/pppoe.config.tmpl
index 8bc6b5f4b..325b75adc 100644
--- a/data/templates/pppoe-server/pppoe.config.tmpl
+++ b/data/templates/pppoe-server/pppoe.config.tmpl
@@ -56,11 +56,11 @@ gw-ip-address={{ ppp_gw }}
{% if client_ipv6_pool %}
[ipv6-pool]
-{% for prefix in client_ipv6_pool['prefix']: %}
-{{ prefix }}
+{% for p in client_ipv6_pool %}
+{{ p.prefix }},{{ p.mask }}
{% endfor %}
-{% for prefix in client_ipv6_pool['delegate-prefix']: %}
-delegate={{ prefix }}
+{% for p in client_ipv6_delegate_prefix %}
+delegate={{ p.prefix }},{{ p.mask }}
{% endfor %}
{% endif %}