Merge pull request 'feat: Merge rules and tables in one file' (#2) from oneFile into master

Reviewed-on: #2

tasks/configuration.yml

@@ -33,10 +33,8 @@
     group: root
     mode: u=rw,g=,o=
     src: "{{ role_path }}/templates/rules.conf.j2"
-    dest: "/srv/nftables/rules_{{ item.filename }}.conf"
+    dest: "/srv/nftables/rules.conf"
-  loop: "{{ nftables_rules }}"
+  when: nftables_rules | length > 0 
-  loop_control:
-    label: "{{ item.filename }}"
   become: true
   notify: Redémarrer nftables.service
 
@@ -45,10 +43,8 @@
     owner: root
     group: root
     mode: u=rw,g=,o=
-    src: "{{ role_path }}/templates/tables.conf.j2"
+    src: tables.conf.j2
-    dest: "/srv/nftables/tables_{{ item.filename }}.conf"
+    dest: /srv/nftables/tables.conf
-  loop: "{{ nftables_tables }}"
+  when: nftables_tables | length > 0
-  loop_control:
-    label: "{{ item.filename }}"
   become: true
   notify: Redémarrer nftables.service

tasks/installation.yml

@@ -12,6 +12,9 @@
     owner: root
     group: root
     mode: u=rwx,g=rx,o=rx
-    state: directory
+    state: "{{ item }}"
     path: /srv/nftables
   become: true
+  loop:
+    - absent
+    - directory

templates/nftables.conf.j2

@@ -16,8 +16,8 @@ table inet filter {
     # accept neighbour discovery otherwise IPv6 connectivity breaks.
     ip6 nexthdr icmpv6 icmpv6 type {nd-neighbor-solicit,  nd-router-advert, nd-neighbor-advert} accept
 
-    # include specifics rules
+    # include specific rules
-    include "/srv/nftables/rules_*.conf"
+    include "/srv/nftables/rules.conf"
 
     # count and drop any other traffic
     counter drop

templates/rules.conf.j2

@@ -1,5 +1,6 @@
 # {{ ansible_managed }}
+{% for item in nftables_rules %}
 
-{% for rule in item.rules %}
+# {{ item.comment }}
-{{ rule }}
+{{ item.rules | join('\n') }}
 {% endfor %}

templates/table.conf.j2

@@ -0,0 +1,55 @@
+{% if 
+    item.ipv4_rules.prerouting | length > 0
+    or
+    item.ipv4_rules.postrouting | length > 0
+%}
+table ip {{ item.name }} {
+{% if item.ipv4_rules.prerouting | length > 0 %}
+  chain prerouting {
+    type nat hook prerouting priority 0;
+
+{% for rule in item.ipv4_rules.prerouting %}
+    {{ rule }}
+{% endfor %}
+  }
+{% endif %}
+
+{% if item.ipv4_rules.postrouting | length > 0 %}
+  chain postrouting {
+    type nat hook postrouting priority 100; policy accept;
+
+{% for rule in item.ipv4_rules.postrouting %}
+    {{ rule }}
+{% endfor %}
+  }
+{% endif %}
+}
+{% endif %}
+
+{% if 
+    item.ipv6_rules.prerouting | length > 0
+    or
+    item.ipv6_rules.postrouting | length > 0
+%}
+table ip6 {{ item.name }} {
+{% if item.ipv6_rules.prerouting | length > 0 %}
+  chain prerouting {
+    type nat hook prerouting priority 0;
+
+{% for rule in item.ipv6_rules.prerouting %}
+    {{ rule }}
+{% endfor %}
+  }
+{% endif %}
+
+{% if item.ipv6_rules.postrouting | length > 0 %}
+  chain postrouting {
+    type nat hook postrouting priority 100; policy accept;
+
+{% for rule in item.ipv6_rules.postrouting %}
+    {{ rule }}
+{% endfor %}
+  }
+{% endif %}
+}
+{% endif %}

templates/tables.conf.j2

@@ -1,57 +1,5 @@
 # {{ ansible_managed }}
+{% for item in nftables_tables %}
 
-{% if 
+{% include "table.conf.j2" %}
-    item.ipv4_rules.prerouting | length > 0
-    or
-    item.ipv4_rules.postrouting | length > 0
-%}
-table ip {{ item.filename }} {
-{% if item.ipv4_rules.prerouting | length > 0 %}
-  chain prerouting {
-    type nat hook prerouting priority 0;
-
-{% for rule in item.ipv4_rules.prerouting %}
-    {{ rule }}
 {% endfor %}
-  }
-{% endif %}
-
-{% if item.ipv4_rules.postrouting | length > 0 %}
-  chain postrouting {
-    type nat hook postrouting priority 100; policy accept;
-
-{% for rule in item.ipv4_rules.postrouting %}
-    {{ rule }}
-{% endfor %}
-  }
-{% endif %}
-}
-{% endif %}
-
-{% if 
-    item.ipv6_rules.prerouting | length > 0
-    or
-    item.ipv6_rules.postrouting | length > 0
-%}
-table ip6 {{ item.filename }} {
-{% if item.ipv6_rules.prerouting | length > 0 %}
-  chain prerouting {
-    type nat hook prerouting priority 0;
-
-{% for rule in item.ipv6_rules.prerouting %}
-    {{ rule }}
-{% endfor %}
-  }
-{% endif %}
-
-{% if item.ipv6_rules.postrouting | length > 0 %}
-  chain postrouting {
-    type nat hook postrouting priority 100; policy accept;
-
-{% for rule in item.ipv6_rules.postrouting %}
-    {{ rule }}
-{% endfor %}
-  }
-{% endif %}
-}
-{% endif %}