From 6dabcb09665b1867c65a973b8c912ac10c9fe140 Mon Sep 17 00:00:00 2001
From: Jeltz <tom.barthe+aurore@ens-paris-saclay.fr>
Date: Wed, 10 Mar 2021 09:43:31 +0100
Subject: [PATCH] Indent nftables sets literals

---
 .../templates/nftables.d/10-vars.conf.j2      | 56 ++++++++++++++-----
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/roles/nftables_router/templates/nftables.d/10-vars.conf.j2 b/roles/nftables_router/templates/nftables.d/10-vars.conf.j2
index af2d7f3..92f8792 100644
--- a/roles/nftables_router/templates/nftables.d/10-vars.conf.j2
+++ b/roles/nftables_router/templates/nftables.d/10-vars.conf.j2
@@ -3,45 +3,73 @@
 ## Interconnexion
 
 # Réseaux d'interconnexion
-define interco_v4 = { {{ nftables_interco_v4 | join(", ") }} }
-define interco_v6 = { {{ nftables_interco_v6 | join(", ") }} }
+define interco_v4 = {
+    {{ nftables_interco_v4 | join(",\n") | indent }}
+}
+define interco_v6 = {
+    {{ nftables_interco_v6 | join(",\n") | indent }}
+}
 
 
 ## Administration
 
 # Réseaux d'administration
-define adm_v4 = { {{ nftables_adm_v4 | join(", ") }} }
-define adm_v6 = { {{ nftables_adm_v6 | join(", ") }} }
+define adm_v4 = {
+    {{ nftables_adm_v4 | join(",\n") | indent }}
+}
+define adm_v6 = {
+    {{ nftables_adm_v6 | join(",\n") | indent }}
+}
 
 # Serveurs de centralisation des journaux
 define syslog_adm_v4 = { 10.128.0.51 }
 define syslog_adm_v6 = { 2a09:6840:128::251 }
 
 # Adresses des bastions autorisés
-define bastions_v4 = { {{ nftables_bastions_v4 | join(", ") }} }
-define bastions_v6 = { {{ nftables_bastions_v6 | join(", ") }} }
+define bastions_v4 = {
+    {{ nftables_bastions_v4 | join(",\n") | indent }}
+}
+define bastions_v6 = {
+    {{ nftables_bastions_v6 | join(",\n") | indent }}
+}
 
 
 ## Services
 
 # Réseaux de services privés
-define svc_v4 = { {{ nftables_svc_v4 | join(", ") }} }
-define svc_v6 = { {{ nftables_svc_v6 | join(", ") }} }
+define svc_v4 = {
+    {{ nftables_svc_v4 | join(",\n") | indent }}
+}
+define svc_v6 = {
+    {{ nftables_svc_v6 | join(",\n") | indent }}
+}
 
 
 ## Adhérents
 
 # Réseaux des adhérents
-define members_v4 = { {{ nftables_members_v4 | join(", ") }} }
-define members_v6 = { {{ nftables_members_v6 | join(", ") }} }
+define members_v4 = {
+    {{ nftables_members_v4 | join(",\n") | indent }}
+}
+define members_v6 = {
+    {{ nftables_members_v6 | join(",\n") | indent }}
+}
 
 # Sous-réseau d'inscription des adhérents
-define signup_v4 = { {{ nftables_signup_v4 | join(", ") }} }
-define signup_v6 = { {{ nftables_signup_v6 | join(", ") }} }
+define signup_v4 = {
+    {{ nftables_signup_v4 | join(",\n") | indent }}
+}
+define signup_v6 = {
+    {{ nftables_signup_v6 | join(",\n") | indent }}
+}
 
 # Hôtes déclencheurs d'accès à Internet pour inscription
-define signup_triggers_v4 = { {{ nftables_signup_triggers_v4 | join(", ") }} }
-define signup_triggers_v6 = { {{ nftables_signup_triggers_v6 | join(", ") }} }
+define signup_triggers_v4 = {
+    {{ nftables_signup_triggers_v4 | join(",\n") | indent }}
+}
+define signup_triggers_v6 = {
+    {{ nftables_signup_triggers_v6 | join(",\n") | indent }}
+}
 
 
 ## NAT