From 1bbc3b6dc3367c0e75c10549b6b7a3065f392472 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 31 May 2015 17:23:55 +0100 Subject: [PATCH] clean up ruby-filesystem declaration Signed-off-by: Stephen Gran --- modules/debian-org/manifests/init.pp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 8eec93ea..9c5b7f1f 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -63,6 +63,8 @@ class debian-org { if ($::lsbmajdistrelease >= 8) { $rubyfs_package = 'ruby-filesystem' + } elsif $::lsbmajdistrelease == 7 { + $rubyfs_package = 'libfilesystem-ruby1.9' } else { $rubyfs_package = 'libfilesystem-ruby1.8' } @@ -80,16 +82,6 @@ class debian-org { ensure => installed, } - if $::lsbmajdistrelease == 7 { - package { 'libfilesystem-ruby1.9.1': - ensure => installed, - } - } elsif $::lsbmajdistrelease >= 8 { - package { 'ruby-filesystem': - ensure => installed, - } - } - munin::check { [ 'cpu', 'entropy', -- 2.39.2