summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp11
-rw-r--r--manifests/ubuntu/karmic.pp5
2 files changed, 1 insertions, 15 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index cd6488b..30a0aca 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,17 +13,8 @@ class shorewall(
case $::operatingsystem {
gentoo: { include shorewall::gentoo }
- debian: {
- include shorewall::debian
- $dist_tor_user = 'debian-tor'
- }
+ debian,ubuntu: {
centos: { include shorewall::centos }
- 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
deleted file mode 100644
index 0df3789..0000000
--- a/manifests/ubuntu/karmic.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class shorewall::ubuntu::karmic inherits shorewall::debian {
- Package['shorewall']{
- name => 'shorewall-shell',
- }
-}