diff options
| author | mh <mh@immerda.ch> | 2013-02-28 19:45:41 +0100 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-03-23 10:51:19 -0400 |
| commit | 66245069f80e62c26d8827252d6bfac914b974ed (patch) | |
| tree | ebbbdae80ad2b8a5d94ee7b6a3d085a469d5d50c | |
| parent | 3e04a43fb31de5e1461289d6810a25df50127c6f (diff) | |
| download | puppet-shorewall-66245069f80e62c26d8827252d6bfac914b974ed.tar.gz puppet-shorewall-66245069f80e62c26d8827252d6bfac914b974ed.tar.bz2 | |
use the centos class on centos based systems
| -rw-r--r-- | manifests/centos.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index 591185a..f671bc9 100644 --- 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 index 5a7f740..85977da 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,7 +16,7 @@ class shorewall( include shorewall::debian $dist_tor_user = 'debian-tor' } - centos: { include shorewall::base } + centos: { include shorewall::centos } ubuntu: { case $::lsbdistcodename { karmic: { include shorewall::ubuntu::karmic } @@ -24,7 +24,7 @@ class shorewall( } } default: { - notice "unknown operatingsystem: ${::operatingsystem}" + notice "unknown operatingsystem: ${::operatingsystem}" include shorewall::base } } @@ -65,5 +65,5 @@ class shorewall( shorewall::managed_file { tunnel: } # See http://www.shorewall.net/MultiISP.html shorewall::managed_file { rtrules: } - + } |