Commit e7a5ffbb authored by mh's avatar mh

shorewall package is only missing for karmic -> treat only karmic special

parent 443d0ca2
class shorewall::base { class shorewall::base {
package { 'shorewall-shell': package { 'shorewall':
ensure => present, ensure => present,
} }
...@@ -16,7 +16,7 @@ class shorewall::base { ...@@ -16,7 +16,7 @@ class shorewall::base {
"puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem", "puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem",
"puppet://$server/modules/shorewall/shorewall.conf" "puppet://$server/modules/shorewall/shorewall.conf"
], ],
require => Package[shorewall-shell], require => Package[shorewall],
notify => Service[shorewall], notify => Service[shorewall],
owner => root, group => 0, mode => 0644; owner => root, group => 0, mode => 0644;
} }
...@@ -40,6 +40,6 @@ class shorewall::base { ...@@ -40,6 +40,6 @@ class shorewall::base {
Exec["concat_/var/lib/puppet/modules/shorewall/routestopped"], Exec["concat_/var/lib/puppet/modules/shorewall/routestopped"],
Exec["concat_/var/lib/puppet/modules/shorewall/params"] Exec["concat_/var/lib/puppet/modules/shorewall/params"]
], ],
require => Package[shorewall-shell], require => Package[shorewall],
} }
} }
class shorewall::debian inherits shorewall::base { class shorewall::debian inherits shorewall::base {
file{'/etc/default/shorewall': file{'/etc/default/shorewall':
source => "puppet://$server/modules/shorewall/debian/default", source => "puppet://$server/modules/shorewall/debian/default",
require => Package['shorewall-shell'], require => Package['shorewall'],
notify => Service['shorewall'], notify => Service['shorewall'],
owner => root, group => 0, mode => 0644; owner => root, group => 0, mode => 0644;
} }
......
...@@ -4,7 +4,13 @@ class shorewall { ...@@ -4,7 +4,13 @@ class shorewall {
case $operatingsystem { case $operatingsystem {
gentoo: { include shorewall::gentoo } 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" default: { notice "unknown operatingsystem: $operatingsystem"
include shorewall::base } include shorewall::base }
} }
......
class shorewall::ubuntu::karmic inherits shorewall::debian {
Package['shorewall']{
name => 'shorewall-shell',
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment