diff options
| author | sever-sever <v.gletenko@vyos.io> | 2021-03-01 08:09:00 +0000 |
|---|---|---|
| committer | sever-sever <v.gletenko@vyos.io> | 2021-03-01 17:02:10 +0000 |
| commit | 8a882f1fb4bfc8f5bc5f8acd344cfe25723b166e (patch) | |
| tree | d477ccd09b887498eca1cd8705275728487f9b99 /data | |
| parent | 49bc3f1e3ff8416908fc986bb60b444a75a1722d (diff) | |
| download | vyos-1x-8a882f1fb4bfc8f5bc5f8acd344cfe25723b166e.tar.gz vyos-1x-8a882f1fb4bfc8f5bc5f8acd344cfe25723b166e.zip | |
pppoe: T3353: Fix regex for listen interface vlan-id
Diffstat (limited to 'data')
| -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(',') }} |