remove apt/perferences.d/buildd on all hosts

[mirror/dsa-puppet.git] / modules / buildd / manifests / init.pp

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index da13c77..2dff5ec 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -48,7 +48,7 @@ class buildd ($ensure=present) {
 
        site::aptrepo { 'buildd.debian.org-proposed':
                ensure     => $::hostname ? {
-                                            /^(alkman|porpora|zandonai)$/ => 'present',
+                                            /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
                                             default => 'absent',
                                            },
                url        => 'https://buildd.debian.org/apt/',
@@ -73,15 +73,14 @@ class buildd ($ensure=present) {
                ensure => absent,
        }
        file { '/etc/apt/preferences.d/buildd':
-               content => template('buildd/etc/apt/preferences.d/buildd'),
-               before  => Site::Aptrepo['buildd.debian.org']
+               ensure => absent,
        }
        file { '/etc/cron.d/dsa-buildd':
                source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
                require => Package['debian.org']
        }
 
-       if $::lsbmajdistrelease >= 7 {
+       if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
                package { 'python-psutil':
                        ensure => installed,
                }