From 3b7a7a9c0b19128622857177acdfff7b44879f42 Mon Sep 17 00:00:00 2001
From: Jack Wozny <admin@jackwozny.com>
Date: Mon, 23 Mar 2020 22:11:11 -0500
Subject: [PATCH] Update zone.xml

Made rich_rules dynamic to allow merging or different pillar files with their own rules
---
 firewalld/files/zone.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/firewalld/files/zone.xml b/firewalld/files/zone.xml
index dabe00a..9336cdd 100644
--- a/firewalld/files/zone.xml
+++ b/firewalld/files/zone.xml
@@ -83,8 +83,9 @@
   {%- endfor %}
 {%- endif %}
 
-{%- if 'rich_rules' in zone %}
-  {%- for rule in zone.rich_rules %}
+{%- for k,val in zone.items() %}
+{%- if k.endswith("rich_rules") %}
+  {%- for rule in val %}
   {%- if 'family' in rule %}
   <rule family="{{ rule.family }}">
   {%- else %}
@@ -151,4 +152,5 @@
   </rule>
   {%- endfor %}
 {%- endif %}
+{%- endfor %}
 </zone>