From 486e4b5779f5069e5fa780e7587ed72a7e30baa8 Mon Sep 17 00:00:00 2001
From: Adam Boutcher <adam.j.boutcher@durham.ac.uk>
Date: Mon, 4 Oct 2021 14:40:46 +0100
Subject: [PATCH] Package_Name param was used in a clever way, moved to
 iptables_name

---
 manifests/linux.pp  |  3 ++-
 manifests/params.pp | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/manifests/linux.pp b/manifests/linux.pp
index d20430e..a81788b 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -31,6 +31,7 @@ class firewall::linux (
   $service_name_v6 = $firewall::params::service_name_v6,
   $package_name    = $firewall::params::package_name,
   $ebtables_manage = false,
+  $iptables_name   = $firewall::params::iptables_name,
 ) inherits ::firewall::params {
   $enable = $ensure ? {
     'running' => true,
@@ -45,7 +46,7 @@ class firewall::linux (
   }
 
   package { 'iptables':
-    name   => $package_name,
+    name   => $iptables_name,
     ensure => $pkg_ensure,
   }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index ac5171b..4f4984d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -11,16 +11,20 @@ class firewall::params {
           $service_name = 'iptables'
           $service_name_v6 = 'ip6tables'
           $package_name = undef
+          $iptables_name = 'iptables'
           $sysconfig_manage = true
         }
         'Fedora': {
           $service_name = 'iptables'
           $service_name_v6 = 'ip6tables'
           if versioncmp($::operatingsystemrelease, '34') >= 0 {
-            $package_name = 'iptables-compat'
+            $package_name = 'iptables-services'
+            $iptables_name = 'iptables-compat'
           } elsif versioncmp($::operatingsystemrelease, '15') >= 0 {
             $package_name = 'iptables-services'
+            $iptables_name = 'iptables'
           } else {
+            $iptables_name = 'iptables'
             $package_name = undef
           }
           $sysconfig_manage = true
@@ -30,16 +34,19 @@ class firewall::params {
             $service_name = ['iptables', 'nftables']
             $service_name_v6 = 'ip6tables'
             $package_name = ['iptables-services', 'nftables']
+            $iptables_name = 'iptables'
             $sysconfig_manage = false
           } elsif versioncmp($::operatingsystemrelease, '7.0') >= 0 {
             $service_name = 'iptables'
             $service_name_v6 = 'ip6tables'
             $package_name = 'iptables-services'
+            $iptables_name = 'iptables'
             $sysconfig_manage = true
           } else {
             $service_name = 'iptables'
             $service_name_v6 = 'ip6tables'
             $package_name = 'iptables-ipv6'
+            $iptables_name = 'iptables'
             $sysconfig_manage = true
           }
         }
@@ -47,6 +54,7 @@ class firewall::params {
     }
     'Debian': {
       $service_name_v6 = undef
+      $iptables_name = 'iptables'
       case $::operatingsystem {
         'Debian': {
           if versioncmp($::operatingsystemrelease, 'unstable') >= 0 {
@@ -81,6 +89,7 @@ class firewall::params {
       $package_name = 'net-firewall/iptables'
     }
     default: {
+      $iptables_name = 'iptables'
       $service_name_v6 = undef
       case $::operatingsystem {
         'Archlinux': {
-- 
2.45.2