From 88f9fd4687ebb0845123cadb9974419cf496a1bf Mon Sep 17 00:00:00 2001
From: Gino Naumann <gino@nauminator.de>
Date: Sun, 25 Apr 2021 02:04:24 +0200
Subject: [PATCH 1/2] fix(zone.xml): fix XML error

---
 firewalld/files/zone.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/firewalld/files/zone.xml b/firewalld/files/zone.xml
index 8a58e6a..a5919ce 100644
--- a/firewalld/files/zone.xml
+++ b/firewalld/files/zone.xml
@@ -14,10 +14,10 @@
     <source ipset="{{ rule.ipset.name }}" />
   {%- endif %}
   {%- if 'source' in rule %}
-    <source address="{{ rule.source.address }}" {%- if 'invert' in rule.source %}invert="{{ rule.source.invert }}"{%- endif %} />
+    <source address="{{ rule.source.address }}" {%- if 'invert' in rule.source %} invert="{{ rule.source.invert }}"{%- endif %} />
   {%- endif %}
   {%- if 'destination' in rule %}
-    <destination address="{{ rule.destination.address }}" {%- if 'invert' in rule.destination %}invert="{{ rule.destination.invert }}"{%- endif %} />
+    <destination address="{{ rule.destination.address }}" {%- if 'invert' in rule.destination %} invert="{{ rule.destination.invert }}"{%- endif %} />
   {%- endif %}
   {%- if 'service' in rule %}
     <service name="{{ rule.service }}" />

From 194cb99f1684bfd0a3ecdf89adc2acd1287d83dd Mon Sep 17 00:00:00 2001
From: Gino Naumann <gino@nauminator.de>
Date: Sun, 25 Apr 2021 02:06:15 +0200
Subject: [PATCH 2/2] fix(zone.xml): fix jinja error in rule.reject

---
 firewalld/files/zone.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firewalld/files/zone.xml b/firewalld/files/zone.xml
index a5919ce..9519b43 100644
--- a/firewalld/files/zone.xml
+++ b/firewalld/files/zone.xml
@@ -63,7 +63,7 @@
     <accept>{%- if rule.accept is mapping and 'limit' in rule.accept %} <limit value="{{ rule.accept.limit }}"/>{%- endif %}</accept>
   {%- endif %}
   {%- if 'reject' in rule %}
-    <reject{%- if 'type' in rule.reject %} type="{{ rule.reject.type }}"{%- endif %} />
+    <reject{%- if rule.reject is mapping and 'type' in rule.reject %} type="{{ rule.reject.type }}"{%- endif %} />
   {%- endif %}
   {%- if 'drop' in rule %}
     <drop/>