From 3dbfe70c12f90e38cdd3773efe66f58dc6f454e9 Mon Sep 17 00:00:00 2001
From: "K. de Jong" <kjong+dev@neobits.nl>
Date: Sat, 10 Jun 2023 08:56:22 +0200
Subject: [PATCH 1/3] test(pillar.example): add `includes`

---
 firewalld/files/service.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/firewalld/files/service.xml b/firewalld/files/service.xml
index 7d92f35..6a0d859 100644
--- a/firewalld/files/service.xml
+++ b/firewalld/files/service.xml
@@ -79,4 +79,9 @@
     {%- endfor %}
   {%- endif %}
 {%- endif %}
+{%- if 'includes' in service %}
+  {%- for v in service.includes %}
+  <include service="{{ v }}" />
+  {%- endfor %}
+{%- endif %}
 </service>

From 124ad06a68d4f942dd862b1e559b97a51dc25ba3 Mon Sep 17 00:00:00 2001
From: "K. de Jong" <kjong+dev@neobits.nl>
Date: Tue, 7 May 2024 13:05:28 +0200
Subject: [PATCH 2/3] feat(service): add option to include existing services
 into a service

---
 firewalld/files/service.xml                              | 5 +++++
 pillar.example                                           | 2 ++
 test/integration/default/files/_mapdata/almalinux-8.yaml | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/firewalld/files/service.xml b/firewalld/files/service.xml
index 6a0d859..4e1102a 100644
--- a/firewalld/files/service.xml
+++ b/firewalld/files/service.xml
@@ -84,4 +84,9 @@
   <include service="{{ v }}" />
   {%- endfor %}
 {%- endif %}
+{%- if 'includes' in service %}
+  {%- for v in service.includes %}
+  <include service="{{ v }}" />
+  {%- endfor %}
+{%- endif %}
 </service>
diff --git a/pillar.example b/pillar.example
index 87d4690..9b3d161 100644
--- a/pillar.example
+++ b/pillar.example
@@ -55,6 +55,8 @@ firewalld:
         ipv6:
           - ff02::fb
           - ff02::fc
+      includes:
+        - dhcp
 
     zabbixcustom:
       short: Zabbixcustom
diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml
index 2b396a8..6046c81 100644
--- a/test/integration/default/files/_mapdata/almalinux-8.yaml
+++ b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -99,6 +99,8 @@ values:
       source_ports:
         tcp:
         - 21
+      includes:
+        - dhcp
     zabbixcustom:
       description: zabbix custom rule
       ports:

From 02f55df8613c7d0417ed56fa3931746a7ffa55aa Mon Sep 17 00:00:00 2001
From: "K. de Jong" <kjong+dev@neobits.nl>
Date: Sun, 12 May 2024 12:17:11 +0200
Subject: [PATCH 3/3] fix(service): no need to add include statement twice

---
 firewalld/files/service.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/firewalld/files/service.xml b/firewalld/files/service.xml
index 4e1102a..6a0d859 100644
--- a/firewalld/files/service.xml
+++ b/firewalld/files/service.xml
@@ -84,9 +84,4 @@
   <include service="{{ v }}" />
   {%- endfor %}
 {%- endif %}
-{%- if 'includes' in service %}
-  {%- for v in service.includes %}
-  <include service="{{ v }}" />
-  {%- endfor %}
-{%- endif %}
 </service>