diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-08-17 08:59:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-17 08:59:49 +0200 |
| commit | c6dee2f3dba77bdbfb7d54f9c01f425c5f3c9176 (patch) | |
| tree | dc655811096a43eb333de14473f96fa89e4a6487 /data/templates/accel-ppp | |
| parent | a43b5c7d1ca00fe67af08ae576889e657ac9b7b0 (diff) | |
| parent | 3bb5d5df1e38a6d995395b6e69ad142e6445b09d (diff) | |
| download | vyos-1x-c6dee2f3dba77bdbfb7d54f9c01f425c5f3c9176.tar.gz vyos-1x-c6dee2f3dba77bdbfb7d54f9c01f425c5f3c9176.zip | |
Merge pull request #3995 from vyos/mergify/bp/circinus/pr-3987
ipoe_server: T6649: Accel-ppp separate vlan-mon from listen interfaces (backport #3987)
Diffstat (limited to 'data/templates/accel-ppp')
| -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 %} |