clean up ruby-filesystem declaration
authorStephen Gran <steve@lobefin.net>
Sun, 31 May 2015 16:23:55 +0000 (17:23 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 31 May 2015 16:23:55 +0000 (17:23 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/debian-org/manifests/init.pp

index 8eec93e..9c5b7f1 100644 (file)
@@ -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',