X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=f001291bd33f9d34ede22fc61b27856f4bbe21ad;hb=6fca7a50094f0b830cb900eaa55dc749c9eef4e6;hp=41efffe5840980999447e0c798659cd7b9eb8a54;hpb=553e1375172ec0062c2a04b1ab4411b31b756483;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 41efffe58..f001291bd 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -2,25 +2,22 @@ class buildd {
     package {
         "schroot": ensure => installed;
         "sbuild": ensure => installed;
-        "buildd": ensure => installed;
-        "buildd-builder-meta": ensure => installed;
         "apt-transport-https": ensure => installed;
         "debootstrap": ensure => installed;
         "dupload": ensure => installed;
     }
-   
+
     file {
         "/etc/apt/preferences.d/buildd":
-             source  => "puppet:///modules/buildd/apt-preferences",
-             before  => File["/etc/apt/sources.list.d/buildd.list"],
-             ;
+            ensure  => absent
+            ;
 
         "/etc/apt/sources.list.d/buildd.list":
              content => template("buildd/etc/apt/sources.list.d/buildd.list.erb"),
              require => Package["apt-transport-https"],
              notify  => Exec["apt-get update"],
              ;
-       
+
         "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
              source  => "puppet:///modules/buildd/buildd.debian.org.asc",
              mode    => 664,