diff options
| author | mh <mh@immerda.ch> | 2009-12-07 18:11:48 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-12-07 18:11:48 +0100 |
| commit | e7a5ffbb316cd2277589f0c649be46fa3a93b160 (patch) | |
| tree | 2f7c6060557057a56e479a30422dda25c48d3ea2 | |
| parent | 443d0ca28791f087a2f95e45d47674c55949099a (diff) | |
| download | puppet-shorewall-e7a5ffbb316cd2277589f0c649be46fa3a93b160.tar.gz puppet-shorewall-e7a5ffbb316cd2277589f0c649be46fa3a93b160.tar.bz2 | |
shorewall package is only missing for karmic -> treat only karmic special
| -rw-r--r-- | manifests/base.pp | 6 | ||||
| -rw-r--r-- | manifests/debian.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 8 | ||||
| -rw-r--r-- | manifests/ubuntu/karmic.pp | 5 |
4 files changed, 16 insertions, 5 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 8a3d5c3..c814795 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,5 +1,5 @@ class shorewall::base { - package { 'shorewall-shell': + package { 'shorewall': ensure => present, } @@ -16,7 +16,7 @@ class shorewall::base { "puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem", "puppet://$server/modules/shorewall/shorewall.conf" ], - require => Package[shorewall-shell], + require => Package[shorewall], notify => Service[shorewall], owner => root, group => 0, mode => 0644; } @@ -40,6 +40,6 @@ class shorewall::base { Exec["concat_/var/lib/puppet/modules/shorewall/routestopped"], Exec["concat_/var/lib/puppet/modules/shorewall/params"] ], - require => Package[shorewall-shell], + require => Package[shorewall], } } diff --git a/manifests/debian.pp b/manifests/debian.pp index a658cdc..2583d85 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -1,7 +1,7 @@ class shorewall::debian inherits shorewall::base { file{'/etc/default/shorewall': source => "puppet://$server/modules/shorewall/debian/default", - require => Package['shorewall-shell'], + require => Package['shorewall'], notify => Service['shorewall'], owner => root, group => 0, mode => 0644; } diff --git a/manifests/init.pp b/manifests/init.pp index 70086dc..61f7fea 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,7 +4,13 @@ class shorewall { case $operatingsystem { gentoo: { include shorewall::gentoo } - debian,ubuntu: { include shorewall::debian } + debian: { include shorewall::debian } + ubuntu: { + case $lsbdistcodename { + karmic: { include shorewall::ubuntu::karmic } + default: { include shorewall::debian } + } + } default: { notice "unknown operatingsystem: $operatingsystem" include shorewall::base } } diff --git a/manifests/ubuntu/karmic.pp b/manifests/ubuntu/karmic.pp new file mode 100644 index 0000000..0df3789 --- /dev/null +++ b/manifests/ubuntu/karmic.pp @@ -0,0 +1,5 @@ +class shorewall::ubuntu::karmic inherits shorewall::debian { + Package['shorewall']{ + name => 'shorewall-shell', + } +} |