move rule merging to python plugin

This commit is contained in:
nd 2021-09-25 15:58:57 +02:00
parent fb6e4ad1df
commit d83605dca8
No known key found for this signature in database
GPG key ID: 21B5CD4DEE3670E9
2 changed files with 26 additions and 11 deletions

View file

@ -6,17 +6,8 @@
{% endmacro %}
{%- macro nftchain(name) -%}
{% set chain_rules = [] %}
{% for i in firewall.chains[name] %}
{% if not firewall.chains[name][i] is mapping %}
{% set tmprule = { 'matches': firewall.chains[name][i] }%}
{% else %}
{% set tmprule = firewall.chains[name][i] %}
{% endif%}
{% set rule = {}|combine(firewall.defaults.all, firewall.defaults[name], {'comment': i}, tmprule, recursive=True) %}{{ chain_rules.append(rule) }}
{% endfor %}
{% for rule in chain_rules|sort(attribute='priority') %}
{{ nftrule(rule) }}
{% for rule in firewall.chains[name]|expand_nft_rules([firewall.defaults.all, firewall.defaults[name]])|sort(attribute='priority') %}
{{ nftrule(rule) }}
{% endfor %}
{% endmacro%}