use weblog_provider role

[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 d5d973d372d095cfae130358326d22490a25af33..efe91dbca428e5c5cbf2bea6eedc31054092ba51 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -20,11 +20,9 @@ class debian-org {
                        'dsa-munin-plugins',
                ]:
                ensure => installed,
-               require => [
-                       File['/etc/apt/sources.list.d/db.debian.org.list'],
-                       Exec['apt-get update']
-               ]
+               tag    => extra_repo,
        }
+
        package { [
                        'apt-utils',
                        'bash-completion',
@@ -39,6 +37,12 @@ class debian-org {
                ensure => installed,
        }
 
+       if $::lsbmajdistrelease >= 7 {
+               package { 'libfilesystem-ruby1.9.1':
+                       ensure => installed,
+               }
+       }
+
        munin::check { [
                        'cpu',
                        'entropy',
@@ -62,10 +66,7 @@ class debian-org {
        if getfromhash($site::nodeinfo, 'broken-rtc') {
                package { 'fake-hwclock':
                        ensure => installed,
-                       require => [
-                               File['/etc/apt/sources.list.d/db.debian.org.list'],
-                               Exec['apt-get update']
-                       ]
+                       tag    => extra_repo,
                }
        }
 
@@ -230,6 +231,7 @@ class debian-org {
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                refreshonly => true,
        }
+       Exec['apt-get update']->Package<| tag == extra_repo |>
 
        exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',