From d1d7a9186c794a1d4e70d6495da95db13f3c780c Mon Sep 17 00:00:00 2001
From: Valentin Bud <valentin.bud@databus.systems>
Date: Mon, 10 Dec 2018 13:44:53 +0200
Subject: [PATCH] Add support for inet6 ipsets.

---
 firewalld/files/ipset.xml |  5 +++++
 pillar.example            | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/firewalld/files/ipset.xml b/firewalld/files/ipset.xml
index 81aedc3..9d4082b 100644
--- a/firewalld/files/ipset.xml
+++ b/firewalld/files/ipset.xml
@@ -27,6 +27,11 @@
   <option name="hashsize" value="{{ v }}"/>
 {%- endfor %}
 {%- endif %}
+{%- if 'family' in ipset.options %}
+{%- for v in ipset.options.family %}
+  <option name="family" value="{{ v }}"/>
+{%- endfor %}
+{%- endif %}
 {%- endif %}
 {%- if 'entries' in ipset %}
 {%- for v in ipset.entries %}
diff --git a/pillar.example b/pillar.example
index 90aba75..6035fe3 100644
--- a/pillar.example
+++ b/pillar.example
@@ -63,6 +63,21 @@ firewalld:
           - 1024
       entries:
         - 10.0.0.1
+    fail2ban-ssh-ipv6:
+      short: fail2ban-ssh-ipv6
+      description: fail2ban-ssh-ipv6 ipset
+      type: 'hash:ip'
+      options:
+        family:
+          - inet6
+        maxelem:
+          - 65536
+        timeout:
+          - 300
+        hashsize:
+          - 1024
+      entries:
+        - 2a01::1
 
   zones:
     public:
@@ -119,4 +134,3 @@ firewalld:
       MYPASSTHROUGH:
         ipv: ipv4
         args: "-t raw -A MYCHAIN -j DROP"
-