From 39f6be1dcb9e28d8f768efe779273d75f6637a5d Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Mon, 6 Mar 2023 11:58:51 +0000 Subject: T5056: Fix IPoE server template for vlan-mon After rewriting IPoE server for config.dict the ipoe.config.j2 template wasn't changed for 'vlan-mon' section Fix it --- data/templates/accel-ppp/ipoe.config.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/templates/accel-ppp/ipoe.config.j2 b/data/templates/accel-ppp/ipoe.config.j2 index 99227ea33..179f2277b 100644 --- a/data/templates/accel-ppp/ipoe.config.j2 +++ b/data/templates/accel-ppp/ipoe.config.j2 @@ -54,9 +54,9 @@ password=csid {% endif %} proxy-arp=1 -{% for interface in interfaces %} -{% if (interface.shared == '0') and (interface.vlan_mon) %} -vlan-mon={{ interface.name }},{{ interface.vlan_mon | join(',') }} +{% for iface, iface_options in interface.items() %} +{% if iface_options.network is vyos_defined('vlan') %} +vlan-mon={{ iface }},{{ iface_options.vlan | join(',') }} {% endif %} {% endfor %} -- cgit v1.2.3