diff options
| author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-06-13 01:45:06 +0200 |
|---|---|---|
| committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-06-14 22:57:52 +0200 |
| commit | 34db435e7a74ee8509777802e03927de2dd57627 (patch) | |
| tree | ffec6668dd4d2f95918ef47f2f8fbbcbb8db4eaa /data/templates/firewall/nftables-policy.j2 | |
| parent | 59526a8adca2922f42778d7563bc0ddc32cfdda8 (diff) | |
| download | vyos-1x-34db435e7a74ee8509777802e03927de2dd57627.tar.gz vyos-1x-34db435e7a74ee8509777802e03927de2dd57627.zip | |
firewall: T4147: Use named sets for firewall groups
* Refactor nftables clean-up code
* Adds policy route test for using firewall groups
Diffstat (limited to 'data/templates/firewall/nftables-policy.j2')
| -rw-r--r-- | data/templates/firewall/nftables-policy.j2 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/data/templates/firewall/nftables-policy.j2 b/data/templates/firewall/nftables-policy.j2 index 0154c9f7e..281525407 100644 --- a/data/templates/firewall/nftables-policy.j2 +++ b/data/templates/firewall/nftables-policy.j2 @@ -1,13 +1,13 @@ #!/usr/sbin/nft -f +{% import 'firewall/nftables-defines.j2' as group_tmpl %} + {% if cleanup_commands is vyos_defined %} {% for command in cleanup_commands %} {{ command }} {% endfor %} {% endif %} -include "/run/nftables_defines.conf" - table ip mangle { {% if first_install is vyos_defined %} chain VYOS_PBR_PREROUTING { @@ -29,6 +29,8 @@ table ip mangle { } {% endfor %} {% endif %} + +{{ group_tmpl.groups(firewall_group, False) }} } table ip6 mangle { @@ -52,4 +54,5 @@ table ip6 mangle { } {% endfor %} {% endif %} +{{ group_tmpl.groups(firewall_group, True) }} } |