diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-15 16:18:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-15 16:18:29 +0100 |
| commit | eb079e4a49150934dec082861176f5a5213c1206 (patch) | |
| tree | 4d74c32d40d8d25522aeb54600a154517df41c53 /data/templates/accel-ppp/l2tp.config.j2 | |
| parent | 697ce8c51c2ae9667a699b3d95e0ffa6b1984328 (diff) | |
| parent | 8eec0b5b062b5f98a865949ac0f2a49d61b81199 (diff) | |
| download | vyos-1x-eb079e4a49150934dec082861176f5a5213c1206.tar.gz vyos-1x-eb079e4a49150934dec082861176f5a5213c1206.zip | |
Merge pull request #3013 from vyos/mergify/bp/sagitta/pr-3004
T6029: Rewritten Accel-PPP services to an identical feature set (backport #3004)
Diffstat (limited to 'data/templates/accel-ppp/l2tp.config.j2')
| -rw-r--r-- | data/templates/accel-ppp/l2tp.config.j2 | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/data/templates/accel-ppp/l2tp.config.j2 b/data/templates/accel-ppp/l2tp.config.j2 index 203a9772e..4ce9042c2 100644 --- a/data/templates/accel-ppp/l2tp.config.j2 +++ b/data/templates/accel-ppp/l2tp.config.j2 @@ -10,6 +10,12 @@ ippool {% include 'accel-ppp/config_modules_ipv6.j2' %} {# Common authentication protocols (pap, chap ...) #} {% include 'accel-ppp/config_modules_auth_protocols.j2' %} +{% if snmp is vyos_defined %} +net-snmp +{% endif %} +{% if limits is vyos_defined %} +connlimit +{% endif %} [core] thread-count={{ thread_count }} @@ -24,15 +30,8 @@ syslog=accel-l2tp,daemon copy=1 level=5 -{# Common DNS name-server definition #} -{% include 'accel-ppp/config_name_server.j2' %} - -{% if wins_server is vyos_defined %} -[wins] -{% for server in wins_server %} -wins{{ loop.index }}={{ server }} -{% endfor %} -{% endif %} +[client-ip-range] +0.0.0.0/0 [l2tp] verbose=1 @@ -56,24 +55,36 @@ ipv6-pool={{ default_ipv6_pool }} ipv6-pool-delegate={{ default_ipv6_pool }} {% endif %} -[client-ip-range] -0.0.0.0/0 - {# Common IP pool definitions #} {% include 'accel-ppp/config_ip_pool.j2' %} +{# Common IPv6 pool definitions #} +{% include 'accel-ppp/config_ipv6_pool.j2' %} + +{# Common DNS name-server definition #} +{% include 'accel-ppp/config_name_server.j2' %} + +{# Common wins-server definition #} +{% include 'accel-ppp/config_wins_server.j2' %} + {# Common chap-secrets and RADIUS server/option definitions #} {% include 'accel-ppp/config_chap_secrets_radius.j2' %} {# Common ppp-options definitions #} {% include 'accel-ppp/ppp-options.j2' %} -{# Common IPv6 pool definitions #} -{% include 'accel-ppp/config_ipv6_pool.j2' %} - {# Common RADIUS shaper configuration #} {% include 'accel-ppp/config_shaper_radius.j2' %} +{# Common Extended scripts configuration #} +{% include 'accel-ppp/config_extended_scripts.j2' %} + +{# Common Limits configuration #} +{% include 'accel-ppp/config_limits.j2' %} + +{# Common SNMP definitions #} +{% include 'accel-ppp/config_snmp.j2' %} + [cli] tcp=127.0.0.1:2004 |