From 9eab0cdd0bbea0f899af5a7d68cc63523a12a703 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 1 May 2022 20:08:28 +0200
Subject: firewall: T4353: fix Jinja2 linting errors

---
 src/conf_mode/firewall.py     | 4 ++--
 src/conf_mode/nat.py          | 2 +-
 src/conf_mode/nat66.py        | 4 ++--
 src/conf_mode/policy-route.py | 2 +-
 src/conf_mode/service_upnp.py | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/conf_mode')

diff --git a/src/conf_mode/firewall.py b/src/conf_mode/firewall.py
index de78d53a8..6924bf555 100755
--- a/src/conf_mode/firewall.py
+++ b/src/conf_mode/firewall.py
@@ -327,8 +327,8 @@ def generate(firewall):
     else:
         firewall['cleanup_commands'] = cleanup_commands(firewall)
 
-    render(nftables_conf, 'firewall/nftables.tmpl', firewall)
-    render(nftables_defines_conf, 'firewall/nftables-defines.tmpl', firewall)
+    render(nftables_conf, 'firewall/nftables.j2', firewall)
+    render(nftables_defines_conf, 'firewall/nftables-defines.j2', firewall)
     return None
 
 def apply_sysfs(firewall):
diff --git a/src/conf_mode/nat.py b/src/conf_mode/nat.py
index 8aaebf9ff..85819a77e 100755
--- a/src/conf_mode/nat.py
+++ b/src/conf_mode/nat.py
@@ -181,7 +181,7 @@ def verify(nat):
     return None
 
 def generate(nat):
-    render(nftables_nat_config, 'firewall/nftables-nat.tmpl', nat)
+    render(nftables_nat_config, 'firewall/nftables-nat.j2', nat)
 
     # dry-run newly generated configuration
     tmp = run(f'nft -c -f {nftables_nat_config}')
diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py
index 1cd15811f..0972151a0 100755
--- a/src/conf_mode/nat66.py
+++ b/src/conf_mode/nat66.py
@@ -146,8 +146,8 @@ def verify(nat):
     return None
 
 def generate(nat):
-    render(nftables_nat66_config, 'firewall/nftables-nat66.tmpl', nat, permission=0o755)
-    render(ndppd_config, 'ndppd/ndppd.conf.tmpl', nat, permission=0o755)
+    render(nftables_nat66_config, 'firewall/nftables-nat66.j2', nat, permission=0o755)
+    render(ndppd_config, 'ndppd/ndppd.conf.j2', nat, permission=0o755)
     return None
 
 def apply(nat):
diff --git a/src/conf_mode/policy-route.py b/src/conf_mode/policy-route.py
index 09d181d43..5de341beb 100755
--- a/src/conf_mode/policy-route.py
+++ b/src/conf_mode/policy-route.py
@@ -204,7 +204,7 @@ def generate(policy):
     else:
         policy['cleanup_commands'] = cleanup_commands(policy)
 
-    render(nftables_conf, 'firewall/nftables-policy.tmpl', policy)
+    render(nftables_conf, 'firewall/nftables-policy.j2', policy)
     return None
 
 def apply_table_marks(policy):
diff --git a/src/conf_mode/service_upnp.py b/src/conf_mode/service_upnp.py
index d21b31990..36f3e18a7 100755
--- a/src/conf_mode/service_upnp.py
+++ b/src/conf_mode/service_upnp.py
@@ -135,7 +135,7 @@ def generate(upnpd):
     if os.path.isfile(config_file):
         os.unlink(config_file)
 
-    render(config_file, 'firewall/upnpd.conf.tmpl', upnpd)
+    render(config_file, 'firewall/upnpd.conf.j2', upnpd)
 
 def apply(upnpd):
     systemd_service_name = 'miniupnpd.service'
-- 
cgit v1.2.3