diff options
| author | mh <mh@immerda.ch> | 2014-07-09 23:25:46 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2015-12-05 11:35:24 +0100 |
| commit | fb07ae738445e524d7f15747f36f8092236f2f48 (patch) | |
| tree | 19a7272cd45a8c9ce78864bd7d9048f9b2656bbc | |
| parent | d153d86fb344c3a780b0efcc180cd3f7c0a75076 (diff) | |
| download | puppet-shorewall-fb07ae738445e524d7f15747f36f8092236f2f48.tar.gz puppet-shorewall-fb07ae738445e524d7f15747f36f8092236f2f48.tar.bz2 | |
get rid off lsb facts
| -rw-r--r-- | manifests/init.pp | 11 | ||||
| -rw-r--r-- | manifests/ubuntu/karmic.pp | 5 |
2 files changed, 1 insertions, 15 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index a567564..9f7edd2 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', - } -} |