diff options
| author | David Vølker <davvol@davvol.dk> | 2025-06-30 08:28:40 +0200 |
|---|---|---|
| committer | David Vølker <davvol@davvol.dk> | 2025-06-30 08:28:40 +0200 |
| commit | e14461a58ba0dd18dff7f9e80da03350ebf1b404 (patch) | |
| tree | 182cbdc95a528f0e55a46b8ebef4866cc9902a16 /data/templates | |
| parent | 862817a7207c5b5d17c67451bac602d296b88230 (diff) | |
| download | vyos-1x-e14461a58ba0dd18dff7f9e80da03350ebf1b404.tar.gz vyos-1x-e14461a58ba0dd18dff7f9e80da03350ebf1b404.zip | |
firewall: T7452: update rule generation for Zone-based firewall
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/firewall/nftables-zone.j2 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/data/templates/firewall/nftables-zone.j2 b/data/templates/firewall/nftables-zone.j2 index 66f7e0b1c..5a2b8912e 100644 --- a/data/templates/firewall/nftables-zone.j2 +++ b/data/templates/firewall/nftables-zone.j2 @@ -12,9 +12,7 @@ oifname { {{ zone_conf.member.interface | quoted_join(',') }} } counter jump VZONE_{{ zone_name }} {% endif %} {% if 'vrf' in zone_conf.member %} -{% for vrf_name in zone_conf.member.vrf %} - oifname { "{{ zone_conf['vrf_interfaces'][vrf_name] }}" } counter jump VZONE_{{ zone_name }} -{% endfor %} + oifname { {{ zone_conf.member.vrf | quoted_join(",") }} } counter jump VZONE_{{ zone_name }} {% endif %} {% endif %} {% endfor %} @@ -69,10 +67,8 @@ oifname { {{ zone[from_zone].member.interface | quoted_join(",") }} } counter return {% endif %} {% if 'vrf' in zone[from_zone].member %} -{% for vrf_name in zone[from_zone].member.vrf %} - oifname { "{{ zone[from_zone]['vrf_interfaces'][vrf_name] }}" } counter jump NAME{{ suffix }}_{{ from_conf.firewall[fw_name] }} - oifname { "{{ zone[from_zone]['vrf_interfaces'][vrf_name] }}" } counter return -{% endfor %} + oifname { {{ zone[from_zone].member.vrf | quoted_join(",") }} } counter jump NAME{{ suffix }}_{{ from_conf.firewall[fw_name] }} + oifname { {{ zone[from_zone].member.vrf | quoted_join(",") }} } counter return {% endif %} {% endfor %} {% endif %} @@ -112,4 +108,4 @@ } {% endif %} {% endfor %} -{% endmacro %}
\ No newline at end of file +{% endmacro %} |