diff options
| author | Nataliia Solomko <natalirs1985@gmail.com> | 2024-08-15 13:20:31 +0300 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-08-16 09:38:06 +0000 |
| commit | 3bb5d5df1e38a6d995395b6e69ad142e6445b09d (patch) | |
| tree | f34e164c77bf40674b4b309f8f6a6a5d3e4f7253 /data/templates | |
| parent | 1ffdf48642e454d7f9ddead8d79f19b96dea00d4 (diff) | |
| download | vyos-1x-3bb5d5df1e38a6d995395b6e69ad142e6445b09d.tar.gz vyos-1x-3bb5d5df1e38a6d995395b6e69ad142e6445b09d.zip | |
T6649: Accel-ppp separate vlan-mon from listen interfacesmergify/bp/circinus/pr-3987
(cherry picked from commit 663e468de2b431f771534b4e3a2d00a5924b98fe)
Diffstat (limited to 'data/templates')
| -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 6711f2ec9..6a387bd46 100644 --- a/data/templates/accel-ppp/pppoe.config.j2 +++ b/data/templates/accel-ppp/pppoe.config.j2 @@ -58,7 +58,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 %} |