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

diff --git a/manifests/base.pp b/manifests/base.pp
index 8a3d5c3343c89b5208ebb00071613d1460d7d1c5..c814795a48bbbd4995f5c6093c7924802f05e01e 100644 (file)
--- 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 a658cdc00e24c1c57776f886ae263e4c9ad5aed4..2583d85e026dc1abc3abf2b6932b14e885314dba 100644 (file)
--- 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 70086dc9274187a004eacdc9c19aae894d1f4bb0..61f7fea7a3a380c46da2c139f3281688ae2d9e22 100644 (file)
--- 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 (file)
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',
+  }
+}