From 8a882f1fb4bfc8f5bc5f8acd344cfe25723b166e Mon Sep 17 00:00:00 2001 From: sever-sever Date: Mon, 1 Mar 2021 08:09:00 +0000 Subject: pppoe: T3353: Fix regex for listen interface vlan-id --- data/templates/accel-ppp/pppoe.config.tmpl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/templates/accel-ppp/pppoe.config.tmpl b/data/templates/accel-ppp/pppoe.config.tmpl index 9d5d58bec..f444af85c 100644 --- a/data/templates/accel-ppp/pppoe.config.tmpl +++ b/data/templates/accel-ppp/pppoe.config.tmpl @@ -102,8 +102,10 @@ ac-name={{ access_concentrator }} interface={{ iface }} {% endif %} {% if iface_config.vlan_id is defined and iface_config.vlan_range is not defined %} -vlan-mon={{ iface }},{{ iface_config.vlan_id | join(',') }} -interface=re:{{ iface | replace('.', '\\.') }}\.\d+ +{% for vlan in iface_config.vlan_id %} +interface={{ iface }}.{{ vlan }} +vlan-mon={{ iface }},{{ vlan }} +{% endfor %} {% endif %} {% if iface_config.vlan_range is defined and iface_config.vlan_id is not defined %} vlan-mon={{ iface }},{{ iface_config.vlan_range | join(',') }} -- cgit v1.2.3