want ruby-filesystem on jessie

[dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index a64fb541987ce008b0df402a4658c475f9bf064a..d224a6bcc31431bf04dcda45b2e76aee21386ef8 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -28,6 +28,7 @@ class debian-org {
                        'sysklogd',
                        'rsyslog',
                        'os-prober',
+                       'apt-listchanges',
                ]:
                ensure => purged,
        }
@@ -59,10 +60,14 @@ class debian-org {
                ensure => installed,
        }
 
-       if $::lsbmajdistrelease >= 7 {
+       if $::lsbmajdistrelease == 7 {
                package { 'libfilesystem-ruby1.9.1':
                        ensure => installed,
                }
+       } elsif $::lsbmajdistrelease >= 8 {
+               package { 'ruby-filesystem':
+                       ensure => installed,
+               }
        }
 
        munin::check { [
@@ -145,7 +150,7 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson]) or
+       #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
        #   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
        #       site::aptrepo { 'proposed-updates':
        #               url        => $mirror,
@@ -250,7 +255,7 @@ class debian-org {
        file { '/etc/rc.local':
                mode   => '0755',
                source => 'puppet:///modules/debian-org/rc.local',
-               notify => Exec['rc.local start'],
+               notify => Exec['service rc.local start'],
        }
        file { '/etc/dsa':
                ensure => directory,
@@ -304,12 +309,10 @@ class debian-org {
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                refreshonly => true
        }
-       exec { 'puppetmaster restart':
-               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+       exec { 'service puppetmaster restart':
                refreshonly => true
        }
-       exec { 'rc.local start':
-               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+       exec { 'service rc.local start':
                refreshonly => true
        }
        exec { 'init q':