conntrack: T4353: fix Jinja2 linting errors

5 files changed, 51 insertions, 51 deletions

diff --git a/data/templates/conntrack/nftables-ct.j2 b/data/templates/conntrack/nftables-ct.j2
new file mode 100644
index 000000000..16a03fc6e
--- /dev/null
+++ b/data/templates/conntrack/nftables-ct.j2
@@ -0,0 +1,48 @@
+#!/usr/sbin/nft -f
+
+{% set nft_ct_ignore_name = 'VYOS_CT_IGNORE' %}
+{% set nft_ct_timeout_name = 'VYOS_CT_TIMEOUT' %}
+
+# we first flush all chains and render the content from scratch - this makes
+# any delta check obsolete
+flush chain raw {{ nft_ct_ignore_name }}
+flush chain raw {{ nft_ct_timeout_name }}
+
+table raw {
+    chain {{ nft_ct_ignore_name }} {
+{% if ignore.rule is vyos_defined %}
+{%     for rule, rule_config in ignore.rule.items() %}
+        # rule-{{ rule }} {{ '- ' ~ rule_config.description if rule_config.description is vyos_defined }}
+{%         set nft_command = '' %}
+{%         if rule_config.inbound_interface is vyos_defined %}
+{%             set nft_command = nft_command ~ ' iifname ' ~ rule_config.inbound_interface %}
+{%         endif %}
+{%         if rule_config.protocol is vyos_defined %}
+{%             set nft_command = nft_command ~ ' ip protocol ' ~ rule_config.protocol %}
+{%         endif %}
+{%         if rule_config.destination.address is vyos_defined %}
+{%             set nft_command = nft_command ~ ' ip daddr ' ~ rule_config.destination.address %}
+{%         endif %}
+{%         if rule_config.destination.port is vyos_defined %}
+{%             set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' dport { ' ~ rule_config.destination.port ~ ' }' %}
+{%         endif %}
+{%         if rule_config.source.address is vyos_defined %}
+{%             set nft_command = nft_command ~ ' ip saddr ' ~ rule_config.source.address %}
+{%         endif %}
+{%         if rule_config.source.port is vyos_defined %}
+{%             set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' sport { ' ~ rule_config.source.port ~ ' }' %}
+{%         endif %}
+       {{ nft_command }} counter notrack comment ignore-{{ rule }}
+{%     endfor %}
+{% endif %}
+        return
+    }
+    chain {{ nft_ct_timeout_name }} {
+{% if timeout.custom.rule is vyos_defined %}
+{%     for rule, rule_config in timeout.custom.rule.items() %}
+        # rule-{{ rule }} {{ '- ' ~ rule_config.description if rule_config.description is vyos_defined }}
+{%     endfor %}
+{% endif %}
+        return
+    }
+}
diff --git a/data/templates/conntrack/nftables-ct.tmpl b/data/templates/conntrack/nftables-ct.tmpl
deleted file mode 100644
index 569e73df1..000000000
--- a/data/templates/conntrack/nftables-ct.tmpl
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/sbin/nft -f
-
-{% set nft_ct_ignore_name = 'VYOS_CT_IGNORE' %}
-{% set nft_ct_timeout_name = 'VYOS_CT_TIMEOUT' %}
-
-# we first flush all chains and render the content from scratch - this makes
-# any delta check obsolete
-flush chain raw {{ nft_ct_ignore_name }}
-flush chain raw {{ nft_ct_timeout_name }}
-
-table raw {
-    chain {{ nft_ct_ignore_name }} {
-{% if ignore.rule is vyos_defined %}
-{%   for rule, rule_config in ignore.rule.items() %}
-        # rule-{{ rule }} {{ '- ' ~ rule_config.description if rule_config.description is vyos_defined }}
-{%     set nft_command = '' %}
-{%     if rule_config.inbound_interface is vyos_defined %}
-{%       set nft_command = nft_command ~ ' iifname ' ~ rule_config.inbound_interface %}
-{%     endif %}
-{%     if rule_config.protocol is vyos_defined %}
-{%       set nft_command = nft_command ~ ' ip protocol ' ~ rule_config.protocol %}
-{%     endif %}
-{%     if rule_config.destination.address is vyos_defined %}
-{%       set nft_command = nft_command ~ ' ip daddr ' ~ rule_config.destination.address %}
-{%     endif %}
-{%     if rule_config.destination.port is vyos_defined %}
-{%       set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' dport { ' ~ rule_config.destination.port ~ ' }' %}
-{%     endif %}
-{%     if rule_config.source.address is vyos_defined %}
-{%       set nft_command = nft_command ~ ' ip saddr ' ~ rule_config.source.address %}
-{%     endif %}
-{%     if rule_config.source.port is vyos_defined %}
-{%       set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' sport { ' ~ rule_config.source.port ~ ' }' %}
-{%     endif %}
-       {{ nft_command }} counter notrack comment ignore-{{ rule }}
-{%   endfor %}
-{% endif %}
-        return
-    }
-    chain {{ nft_ct_timeout_name }} {
-{% if timeout.custom.rule is vyos_defined %}
-{%   for rule, rule_config in timeout.custom.rule.items() %}
-        # rule-{{ rule }} {{ '- ' ~ rule_config.description if rule_config.description is vyos_defined }}
-{%   endfor %}
-{% endif %}
-        return
-    }
-}
diff --git a/data/templates/conntrack/sysctl.conf.tmpl b/data/templates/conntrack/sysctl.conf.j2
index 075402c04..075402c04 100644
--- a/data/templates/conntrack/sysctl.conf.tmpl
+++ b/data/templates/conntrack/sysctl.conf.j2
diff --git a/data/templates/conntrack/vyos_nf_conntrack.conf.tmpl b/data/templates/conntrack/vyos_nf_conntrack.conf.j2
index 111459485..111459485 100644
--- a/data/templates/conntrack/vyos_nf_conntrack.conf.tmpl
+++ b/data/templates/conntrack/vyos_nf_conntrack.conf.j2
diff --git a/src/conf_mode/conntrack.py b/src/conf_mode/conntrack.py
index aabf2bdf5..82289526f 100755
--- a/src/conf_mode/conntrack.py
+++ b/src/conf_mode/conntrack.py
@@ -101,9 +101,9 @@ def verify(conntrack):
     return None
 
 def generate(conntrack):
-    render(conntrack_config, 'conntrack/vyos_nf_conntrack.conf.tmpl', conntrack)
-    render(sysctl_file, 'conntrack/sysctl.conf.tmpl', conntrack)
-    render(nftables_ct_file, 'conntrack/nftables-ct.tmpl', conntrack)
+    render(conntrack_config, 'conntrack/vyos_nf_conntrack.conf.j2', conntrack)
+    render(sysctl_file, 'conntrack/sysctl.conf.j2', conntrack)
+    render(nftables_ct_file, 'conntrack/nftables-ct.j2', conntrack)
 
     # dry-run newly generated configuration
     tmp = run(f'nft -c -f {nftables_ct_file}')