diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2024-02-02 10:51:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-02 10:51:11 +0200 |
| commit | cb702bbe61436286c2ac9400ee4e09c4b5ac397c (patch) | |
| tree | a2c5e1a276af9fa1af24d200e49355995479fbe6 /data/templates/accel-ppp/l2tp.config.j2 | |
| parent | a092d507aefcf2c3588a7bcb7496c1c0cbfa7fe8 (diff) | |
| parent | 52e868e1abfecf00aafc359adefcd3ca7c57b8bd (diff) | |
| download | vyos-1x-cb702bbe61436286c2ac9400ee4e09c4b5ac397c.tar.gz vyos-1x-cb702bbe61436286c2ac9400ee4e09c4b5ac397c.zip | |
Merge pull request #2928 from vyos/mergify/bp/sagitta/pr-2891
T5971: Rewritten ppp options in accel-ppp services (backport #2891)
Diffstat (limited to 'data/templates/accel-ppp/l2tp.config.j2')
| -rw-r--r-- | data/templates/accel-ppp/l2tp.config.j2 | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/data/templates/accel-ppp/l2tp.config.j2 b/data/templates/accel-ppp/l2tp.config.j2 index f041e278e..203a9772e 100644 --- a/data/templates/accel-ppp/l2tp.config.j2 +++ b/data/templates/accel-ppp/l2tp.config.j2 @@ -65,30 +65,8 @@ ipv6-pool-delegate={{ default_ipv6_pool }} {# Common chap-secrets and RADIUS server/option definitions #} {% include 'accel-ppp/config_chap_secrets_radius.j2' %} -[ppp] -verbose=1 -check-ip=1 -single-session=replace -lcp-echo-interval={{ ppp_options.lcp_echo_interval }} -lcp-echo-timeout={{ ppp_options.lcp_echo_timeout }} -lcp-echo-failure={{ ppp_options.lcp_echo_failure }} -{# MTU #} -mtu={{ mtu }} -ipv6={{ 'allow' if ppp_options.ipv6 is vyos_defined("deny") and client_ipv6_pool is vyos_defined else ppp_options.ipv6 }} -ipv4={{ ppp_options.ipv4 }} -mppe={{ ppp_options.mppe }} -{% if ccp_disable is vyos_defined %} -ccp=0 -{% endif %} -unit-preallocate={{ "1" if authentication.radius.preallocate_vif is vyos_defined else "0" }} - -{% if ppp_options.ipv6_intf_id is vyos_defined %} -ipv6-intf-id={{ ppp_options.ipv6_intf_id }} -{% endif %} -{% if ppp_options.ipv6_peer_intf_id is vyos_defined %} -ipv6-peer-intf-id={{ ppp_options.ipv6_peer_intf_id }} -{% endif %} -ipv6-accept-peer-intf-id={{ "1" if ppp_options.ipv6_accept_peer_intf_id is vyos_defined else "0" }} +{# Common ppp-options definitions #} +{% include 'accel-ppp/ppp-options.j2' %} {# Common IPv6 pool definitions #} {% include 'accel-ppp/config_ipv6_pool.j2' %} @@ -98,5 +76,4 @@ ipv6-accept-peer-intf-id={{ "1" if ppp_options.ipv6_accept_peer_intf_id is vyos_ [cli] tcp=127.0.0.1:2004 -sessions-columns=ifname,username,calling-sid,ip,{{ ip6_column | join(',') }}{{ ',' if ip6_column }}rate-limit,type,comp,state,rx-bytes,tx-bytes,uptime |