From 49442dfa6a1bd2a2d4b4e552d52c81f4301a6eae Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 24 Oct 2021 23:07:10 -0500
Subject: [PATCH] Test for firewalld before configuring with it

---
 tasks/main.yml             |  2 ++
 vars/Fedora-34-default.yml | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 117ca83..0bb3962 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -102,6 +102,8 @@
 - name: 'ensure firewall'
   when:
     - ansible_system == 'Linux'
+    - packages["firewalld"] is defined
+    - packages["python3-firewall"] is defined
     - ensure_apache is defined
     - ensure_apache.firewall_list is defined
     - ensure_apache.firewall_list is iterable
diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml
index d70fcb4..c511e5b 100644
--- a/vars/Fedora-34-default.yml
+++ b/vars/Fedora-34-default.yml
@@ -3,13 +3,13 @@
 package_list:
   - name: 'httpd'
     state: 'present'
-# firewall_list:
-#   - permanent: 'yes'
-#     service: 'http'
-#     state: 'enabled'
-#   - permanent: 'yes'
-#     service: 'https'
-#     state: 'enabled'
+firewall_list:
+  - permanent: 'yes'
+    service: 'http'
+    state: 'enabled'
+  - permanent: 'yes'
+    service: 'https'
+    state: 'enabled'
 seboolean_list:
   - name: 'httpd_can_network_connect'
     persistent: 'yes'