Merge pull request #14 from rehanone/develop/ferm-as-firewall

- Apply firewall rules if `ferm` is defined as firewall manager. It u…
rehanone · May 1, 2020 · 2afa34f · 2afa34f
2 parents bf08e2c + 42e4fe4
commit 2afa34f
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/manifests/firewall.pp b/manifests/firewall.pp
@@ -4,14 +4,27 @@
 
   assert_private("Use of private class ${name} by ${caller_module_name}")
 
-  if $samba::firewall_manage and defined('::firewall') {
+  if $samba::firewall_manage {
     $samba::hosts_allow.each |$network| {
       $samba::service_ports.each |$entry| {
-        firewall { "${entry[port]} Allow inbound ${entry[proto]} connection on port: ${entry[port]} from: ${network}":
-          dport  => $entry[port],
-          source => $network,
-          proto  => $entry[proto],
-          action => accept,
+
+        if defined('::firewall') {
+          firewall { "${entry[port]} Allow SAMBA ${entry[proto]} connection on port: ${entry[port]} from: ${network}":
+            dport  => $entry[port],
+            source => $network,
+            proto  => $entry[proto],
+            action => accept,
+          }
+        }
+
+        if defined('::ferm') {
+          ferm::rule { "${entry[port]} Allow SAMBA ${entry[proto]} connection on port: ${entry[port]} from: ${network}":
+            chain  => 'INPUT',
+            action => 'ACCEPT',
+            proto  => $entry[proto],
+            dport  => $entry[port],
+            saddr  => $network,
+          }
         }
       }
     }