diff options
| author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-01-20 00:27:53 +0100 |
|---|---|---|
| committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-01-20 11:14:43 +0100 |
| commit | d1d0150b6a40252700181530ca87c5699a4bd0b4 (patch) | |
| tree | b61b5943369de9f185dea682e933e195f2d91cf4 /data/templates/firewall/nftables-policy.tmpl | |
| parent | 569dfa77f07cb707dec4b29ed3e2a350e214af80 (diff) | |
| download | vyos-1x-d1d0150b6a40252700181530ca87c5699a4bd0b4.tar.gz vyos-1x-d1d0150b6a40252700181530ca87c5699a4bd0b4.zip | |
firewall: T2199: Add log prefix to match legacy perl behaviour
Example syslog: [FWNAME-default-D] ...
* Also clean-up firewall default-action
Diffstat (limited to 'data/templates/firewall/nftables-policy.tmpl')
| -rw-r--r-- | data/templates/firewall/nftables-policy.tmpl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/data/templates/firewall/nftables-policy.tmpl b/data/templates/firewall/nftables-policy.tmpl index 484b6f203..905ffcd09 100644 --- a/data/templates/firewall/nftables-policy.tmpl +++ b/data/templates/firewall/nftables-policy.tmpl @@ -25,11 +25,7 @@ table ip mangle { {{ rule_conf | nft_rule(route_text, rule_id, 'ip') }} {% endfor %} {% endif %} -{% if conf.default_action is defined %} - counter {{ conf.default_action | nft_action }} comment "{{ name_text }} default-action {{ conf.default_action }}" -{% else %} - counter return -{% endif %} + {{ conf | nft_default_rule(route_text) }} } {% endfor %} {%- endif %} @@ -52,9 +48,7 @@ table ip6 mangle { {{ rule_conf | nft_rule(route_text, rule_id, 'ip6') }} {% endfor %} {% endif %} -{% if conf.default_action is defined %} - counter {{ conf.default_action | nft_action }} comment "{{ name_text }} default-action {{ conf.default_action }}" -{% endif %} + {{ conf | nft_default_rule(route_text) }} } {% endfor %} {% endif %} |