summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2022-12-09 10:04:34 +0000
committerViacheslav Hletenko <v.gletenko@vyos.io>2022-12-09 11:27:12 +0000
commit056746bbbdc0cc139d20b9fecb807c78d04c6097 (patch)
tree0d1e9c265919866687e3067e32146a842e0402f3 /data/templates
parent7e449725bf903a6a6ab48f474a0306b1c6e195ae (diff)
downloadvyos-1x-056746bbbdc0cc139d20b9fecb807c78d04c6097.tar.gz
vyos-1x-056746bbbdc0cc139d20b9fecb807c78d04c6097.zip
T4868: Fix l2tp ppp IPv6 options in template and config get dict
L2TP 'ppp-options ipv6 x' can work without declaring IPv6 pool As we can get addresses via RADIUS attributes: - Framed-IPv6-Prefix - Delegated-IPv6-Prefix
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/accel-ppp/l2tp.config.j26
1 files changed, 4 insertions, 2 deletions
diff --git a/data/templates/accel-ppp/l2tp.config.j2 b/data/templates/accel-ppp/l2tp.config.j2
index 986f19656..3d1e835a9 100644
--- a/data/templates/accel-ppp/l2tp.config.j2
+++ b/data/templates/accel-ppp/l2tp.config.j2
@@ -121,8 +121,10 @@ lcp-echo-failure={{ ppp_echo_failure }}
{% if ccp_disable %}
ccp=0
{% endif %}
-{% if client_ipv6_pool %}
-ipv6=allow
+{% if ppp_ipv6 is vyos_defined %}
+ipv6={{ ppp_ipv6 }}
+{% else %}
+{{ 'ipv6=allow' if client_ipv6_pool_configured else '' }}
{% endif %}