diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-08-16 07:03:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-16 07:03:04 +0100 |
| commit | 9e740c4339d215ff7332d22d12d40f4acd75d4c8 (patch) | |
| tree | b6840aa64850b1f0c9aaa30799d77250b3c9474a /data | |
| parent | cb1eec686cfe7b64142980963d44ae47a4eb66cc (diff) | |
| parent | 663e468de2b431f771534b4e3a2d00a5924b98fe (diff) | |
| download | vyos-1x-9e740c4339d215ff7332d22d12d40f4acd75d4c8.tar.gz vyos-1x-9e740c4339d215ff7332d22d12d40f4acd75d4c8.zip | |
Merge pull request #3987 from natali-rs1985/T6649-current
ipoe_server: T6649: Accel-ppp separate vlan-mon from listen interfaces
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/accel-ppp/ipoe.config.j2 | 2 | ||||
| -rw-r--r-- | data/templates/accel-ppp/pppoe.config.j2 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/data/templates/accel-ppp/ipoe.config.j2 b/data/templates/accel-ppp/ipoe.config.j2 index 9729b295e..81f63c53b 100644 --- a/data/templates/accel-ppp/ipoe.config.j2 +++ b/data/templates/accel-ppp/ipoe.config.j2 @@ -56,7 +56,7 @@ verbose=1 {% set relay = ',' ~ 'relay=' ~ iface_config.external_dhcp.dhcp_relay if iface_config.external_dhcp.dhcp_relay is vyos_defined else '' %} {% set giaddr = ',' ~ 'giaddr=' ~ iface_config.external_dhcp.giaddr if iface_config.external_dhcp.giaddr is vyos_defined else '' %} {{ tmp }},{{ shared }}mode={{ iface_config.mode | upper }},ifcfg=1,{{ range }}start=dhcpv4,ipv6=1{{ relay }}{{ giaddr }} -{% if iface_config.vlan is vyos_defined %} +{% if iface_config.vlan_mon is vyos_defined %} vlan-mon={{ iface }},{{ iface_config.vlan | join(',') }} {% endif %} {% endfor %} diff --git a/data/templates/accel-ppp/pppoe.config.j2 b/data/templates/accel-ppp/pppoe.config.j2 index 73ffe0963..beab46936 100644 --- a/data/templates/accel-ppp/pppoe.config.j2 +++ b/data/templates/accel-ppp/pppoe.config.j2 @@ -61,7 +61,9 @@ interface={{ iface }} {% for vlan in iface_config.vlan %} interface=re:^{{ iface }}\.{{ vlan | range_to_regex }}$ {% endfor %} +{% if iface_config.vlan_mon is vyos_defined %} vlan-mon={{ iface }},{{ iface_config.vlan | join(',') }} +{% endif %} {% endif %} {% endfor %} {% endif %} |