diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-03-01 19:25:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 19:25:22 +0100 |
| commit | ecd936a0189e7f785929a585cd190cbbf3bc4c1b (patch) | |
| tree | 15dd17114e25602889ab61409a9c7eabed2a13c1 | |
| parent | c3df52388bb043d95f6ab880f686f4b7bc37c8be (diff) | |
| parent | 8a882f1fb4bfc8f5bc5f8acd344cfe25723b166e (diff) | |
| download | vyos-1x-ecd936a0189e7f785929a585cd190cbbf3bc4c1b.tar.gz vyos-1x-ecd936a0189e7f785929a585cd190cbbf3bc4c1b.zip | |
Merge pull request #755 from sever-sever/T3353
pppoe: T3353: Remove regex for listen interface vlan-id
| -rw-r--r-- | data/templates/accel-ppp/pppoe.config.tmpl | 6 |
1 files 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(',') }} |