diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/base.pp | 6 | ||||
| -rw-r--r-- | manifests/debian.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index c814795..8a3d5c3 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,5 +1,5 @@ class shorewall::base { - package { 'shorewall': + package { 'shorewall-shell': 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], + require => Package[shorewall-shell], 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], + require => Package[shorewall-shell], } } diff --git a/manifests/debian.pp b/manifests/debian.pp index 2583d85..a658cdc 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'], + require => Package['shorewall-shell'], notify => Service['shorewall'], owner => root, group => 0, mode => 0644; } diff --git a/manifests/init.pp b/manifests/init.pp index d05504e..1daf403 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,7 +5,9 @@ class shorewall { case $operatingsystem { gentoo: { include shorewall::gentoo } debian: { include shorewall::debian } - default: { include shorewall::base } + ubuntu: { include shorewall::debian } + default: { notice "unknown operatingsystem: $operatingsystem" + include shorewall::base } } file {"/var/lib/puppet/modules/shorewall": |