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

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 890a238fa53717e7e14d330476384ccc8703171c..965c149edb8c135a9d140d049a10334de54e26f2 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,5 +1,6 @@
 class buildd {
     package {
+        "schroot": ensure => installed;
         "sbuild": ensure => installed;
         "buildd": ensure => installed;
         "buildd-builder-meta": ensure => installed;
@@ -7,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,
@@ -26,12 +31,16 @@ class buildd {
              ;
         "/etc/cron.d/dsa-buildd":
              source => "puppet:///modules/buildd/cron.d-dsa-buildd",
-             require => Package["cron"]
+             require => Package["debian.org"]
              ;
         "/etc/dupload.conf":
              source => "puppet:///modules/buildd/dupload.conf",
              require => Package["dupload"]
              ;
+        "/etc/default/schroot":
+             source => "puppet:///modules/buildd/default-schroot",
+             require => Package["schroot"]
+             ;
     }
 
     case $kernel {