collect slightly fewer packages

[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 04db264f5a5528a0fe26d7bc39b9a2ec64077d03..1c42d5f59cea63ca311f16501b66ed7b19ce94bc 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':
+                       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,
                }
        }
 
@@ -83,15 +84,13 @@ class debian-org {
                require => Package['molly-guard'],
        }
 
-       # This really means 'not wheezy'
-
-       if $::debarchitecture != 'armhf' {
-               site::aptrepo { 'security':
-                       url        => 'http://security.debian.org/',
-                       suite      => "${::lsbdistcodename}/updates",
-                       components => ['main','contrib','non-free']
-               }
+       site::aptrepo { 'security':
+               url        => 'http://security.debian.org/',
+               suite      => "${::lsbdistcodename}/updates",
+               components => ['main','contrib','non-free']
+       }
 
+       if $::lsbdistcodename != 'wheezy' {
                site::aptrepo { 'backports.debian.org':
                        url        => 'http://backports.debian.org/debian-backports/',
                        suite      => "${::lsbdistcodename}-backports",
@@ -132,7 +131,7 @@ class debian-org {
        if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
                site::aptrepo { 'debian':
                        url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
-                       suite      => "${::lsbdistcodename}",
+                       suite      => $::lsbdistcodename,
                        components => ['main','contrib','non-free']
                }
        }
@@ -232,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',