diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-12-28 21:28:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-28 21:28:03 +0000 |
| commit | 0e8799091f7e49c4810320a47dd19c554955d007 (patch) | |
| tree | 297973a17ebbe238b4a707e17685f656530a0881 /data/templates/accel-ppp/l2tp.config.j2 | |
| parent | 35615152cae072af685f6475af1af5a070015a4d (diff) | |
| parent | e0c7d8a8305925c26073098474ed230da05fae11 (diff) | |
| download | vyos-1x-0e8799091f7e49c4810320a47dd19c554955d007.tar.gz vyos-1x-0e8799091f7e49c4810320a47dd19c554955d007.zip | |
Merge pull request #2700 from vyos/mergify/bp/sagitta/pr-2501
accel-ppp: T5688: Standardized pool configuration in accel-ppp (backport #2501)
Diffstat (limited to 'data/templates/accel-ppp/l2tp.config.j2')
| -rw-r--r-- | data/templates/accel-ppp/l2tp.config.j2 | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/data/templates/accel-ppp/l2tp.config.j2 b/data/templates/accel-ppp/l2tp.config.j2 index b089d3e71..89cc0eae7 100644 --- a/data/templates/accel-ppp/l2tp.config.j2 +++ b/data/templates/accel-ppp/l2tp.config.j2 @@ -6,11 +6,9 @@ chap-secrets {% for proto in auth_proto %} {{ proto }} {% endfor %} - {% if auth_mode == 'radius' %} radius {% endif %} - ippool shaper ipv6pool @@ -65,24 +63,15 @@ secret={{ lns_shared_secret }} {% if lns_host_name %} host-name={{ lns_host_name }} {% endif %} +{% if default_pool is vyos_defined %} +ip-pool={{ default_pool }} +{% endif %} [client-ip-range] 0.0.0.0/0 -{% if client_ip_pool or client_ip_subnets %} -[ip-pool] -{% if client_ip_pool %} -{{ client_ip_pool }} -{% endif %} -{% if client_ip_subnets %} -{% for sn in client_ip_subnets %} -{{ sn }} -{% endfor %} -{% endif %} -{% endif %} -{% if gateway_address %} -gw-ip-address={{ gateway_address }} -{% endif %} +{# Common IP pool definitions #} +{% include 'accel-ppp/config_ip_pool.j2' %} {% if auth_mode == 'local' %} [chap-secrets] @@ -115,7 +104,7 @@ nas-ip-address={{ radius_nas_ip }} bind={{ radius_source_address }} {% endif %} {% endif %} -{% if gateway_address %} +{% if gateway_address is vyos_defined %} gw-ip-address={{ gateway_address }} {% endif %} |