summaryrefslogtreecommitdiff
path: root/data/templates/accel-ppp
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-03-16 21:14:59 +0100
committerGitHub <noreply@github.com>2023-03-16 21:14:59 +0100
commitfa174bf8e42bda194b7886470eceeca0683782cd (patch)
tree19a3005cd7b1d87e7dcf8b932bfdd73cf091fa78 /data/templates/accel-ppp
parent5619dd6fd7b38314488db998cdf912950e3fdc3d (diff)
parent45de84952e6fca7aba397bc1097de5b0b9509937 (diff)
downloadvyos-1x-fa174bf8e42bda194b7886470eceeca0683782cd.tar.gz
vyos-1x-fa174bf8e42bda194b7886470eceeca0683782cd.zip
Merge pull request #1893 from sever-sever/T5092
T5092: IPoE-server named pool must not rely on auth type
Diffstat (limited to 'data/templates/accel-ppp')
-rw-r--r--data/templates/accel-ppp/ipoe.config.j216
1 files changed, 8 insertions, 8 deletions
diff --git a/data/templates/accel-ppp/ipoe.config.j2 b/data/templates/accel-ppp/ipoe.config.j2
index 27621bc9b..ac83c3dbd 100644
--- a/data/templates/accel-ppp/ipoe.config.j2
+++ b/data/templates/accel-ppp/ipoe.config.j2
@@ -44,18 +44,18 @@ vlan-mon={{ iface }},{{ iface_config.vlan | join(',') }}
{% endif %}
{% if authentication.mode is vyos_defined('noauth') %}
noauth=1
-{% if client_ip_pool.name is vyos_defined %}
-{% for pool, pool_options in client_ip_pool.name.items() %}
-{% if pool_options.subnet is vyos_defined and pool_options.gateway_address is vyos_defined %}
-ip-pool={{ pool }}
-gw-ip-address={{ pool_options.gateway_address }}/{{ pool_options.subnet.split('/')[1] }}
-{% endif %}
-{% endfor %}
-{% endif %}
{% elif authentication.mode is vyos_defined('local') %}
username=ifname
password=csid
{% endif %}
+{% if client_ip_pool.name is vyos_defined %}
+{% for pool, pool_options in client_ip_pool.name.items() %}
+{% if pool_options.subnet is vyos_defined and pool_options.gateway_address is vyos_defined %}
+ip-pool={{ pool }}
+gw-ip-address={{ pool_options.gateway_address }}/{{ pool_options.subnet.split('/')[1] }}
+{% endif %}
+{% endfor %}
+{% endif %}
proxy-arp=1
{% if client_ip_pool.name is vyos_defined %}