diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-12-09 14:07:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-09 14:07:44 +0100 |
| commit | b67f7c85b72b1d3134c2a4ae533e5dcd8cdaa2ca (patch) | |
| tree | 0d1e9c265919866687e3067e32146a842e0402f3 /data | |
| parent | 7e449725bf903a6a6ab48f474a0306b1c6e195ae (diff) | |
| parent | 056746bbbdc0cc139d20b9fecb807c78d04c6097 (diff) | |
| download | vyos-1x-b67f7c85b72b1d3134c2a4ae533e5dcd8cdaa2ca.tar.gz vyos-1x-b67f7c85b72b1d3134c2a4ae533e5dcd8cdaa2ca.zip | |
Merge pull request #1700 from sever-sever/T4868
T4868: Fix l2tp ppp IPv6 options in template and config get dict
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/accel-ppp/l2tp.config.j2 | 6 |
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 %} |