From 69243a7443cef0d9630ad19b949184ad71fb208e Mon Sep 17 00:00:00 2001
From: Trevor Vaughan <trevor@sicura.us>
Date: Sat, 26 Mar 2022 19:41:01 -0400
Subject: [PATCH] Work around upstream bug

`puppet-firewalld` needs to have an autorequire on
`firewalld_custom_service` if one is declared.

Closes #25
---
 manifests/rule.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/rule.pp b/manifests/rule.pp
index 44b9c12..3fc686d 100644
--- a/manifests/rule.pp
+++ b/manifests/rule.pp
@@ -281,7 +281,12 @@
                   service => $_rich_rule_svc,
                   action  => 'accept',
                   zone    => $_zone,
-                  require => Service['firewalld'],
+                  require => Service['firewalld']
+                }
+
+                # Work around bug in puppet-firewalld
+                if $_rich_rule_svc {
+                  Firewalld_custom_service[$_rich_rule_svc] => Firewalld_rich_rule[$_unique_name]
                 }
               }
             }