Merge pull request #526 from elyscape/arch_linux

Fix Arch Linux support
xbezdick · May 7, 2015 · db063e5 · db063e5
2 parents d6a9344 + 213a5a2
commit db063e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/manifests/linux/gentoo.pp b/manifests/linux/gentoo.pp
@@ -1,7 +1,7 @@
 # = Class: firewall::linux::gentoo
 #
 # Manages `iptables` and `ip6tables` services, and creates files used for
-# persistence, on Arch Linux systems.
+# persistence, on Gentoo Linux systems.
 #
 # == Parameters:
 #

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -6,10 +6,6 @@
           $service_name = 'iptables'
           $package_name = undef
         }
-        'Archlinux': {
-          $service_name = ['iptables','ip6tables']
-          $package_name = undef
-        }
         'Fedora': {
           if versioncmp($::operatingsystemrelease, '15') >= 0 {
             $package_name = 'iptables-services'
@@ -61,8 +57,16 @@
       $package_name = 'net-firewall/iptables'
     }
     default: {
-      $package_name = undef
-      $service_name = 'iptables'
+      case $::operatingsystem {
+        'Archlinux': {
+          $service_name = ['iptables','ip6tables']
+          $package_name = undef
+        }
+        default: {
+          $service_name = 'iptables'
+          $package_name = undef
+        }
+      }
     }
   }
 }
diff --git a/spec/unit/classes/firewall_linux_archlinux_spec.rb b/spec/unit/classes/firewall_linux_archlinux_spec.rb
@@ -3,7 +3,7 @@
 describe 'firewall::linux::archlinux', :type => :class do
   let(:facts) do
     {
-      :osfamily        => 'RedHat',
+      :osfamily        => 'Archlinux',
       :operatingsystem => 'Archlinux'
     }
   end