Merge pull request #1893 from sever-sever/T5092

T5092: IPoE-server named pool must not rely on auth type

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 %}