use the centos class on centos based systems

duritong · Mar 23, 2013 · 6624506 · 6624506
1 parent 3e04a43
commit 6624506
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manifests/centos.pp b/manifests/centos.pp
@@ -1,6 +1,6 @@
 # things needed on centos
 class shorewall::centos inherits shorewall::base {
-  if $::lsbmajdistrelease == '6' {
+  if $::lsbmajdistrelease > 5 {
     augeas{'enable_shorewall':
       context => '/files/etc/sysconfig/shorewall',
       changes => 'set startup 1',

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -16,15 +16,15 @@
       include shorewall::debian
       $dist_tor_user = 'debian-tor'
     }
-    centos: { include shorewall::base }
+    centos: { include shorewall::centos }
     ubuntu: {
     case $::lsbdistcodename {
       karmic: { include shorewall::ubuntu::karmic }
       default: { include shorewall::debian }
       }
     }
     default: {
-      notice "unknown operatingsystem: ${::operatingsystem}" 
+      notice "unknown operatingsystem: ${::operatingsystem}"
       include shorewall::base
     }
   }
@@ -65,5 +65,5 @@
   shorewall::managed_file { tunnel: }
   # See http://www.shorewall.net/MultiISP.html
   shorewall::managed_file { rtrules: }
-  
+
 }