From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 17 Jan 2012 13:52:53 +0000 (+0100)
Subject: and remove existing preferences.d/buildd file, for now
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=602da749ecadcfb6da2783c2d8456bd6b3472ca5;p=dsa-puppet.git

and remove existing preferences.d/buildd file, for now
---

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index a5af7bed..965c149e 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -8,14 +8,18 @@ class buildd {
         "debootstrap": ensure => installed;
         "dupload": ensure => installed;
     }
-   
+
     file {
+        "/etc/apt/preferences.d/buildd":
+            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,