get rid of the apt repo until they fix it

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 16f844155a332d74bb0164ebbd8f0a907514d5e0..0bb425e85daf5d6534e060586b5d599ccb75048b 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,33 +1,50 @@
 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":
+             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"],
+             ensure => absent,
              ;
        
         "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
-             source  => "puppet:///buildd/buildd.debian.org.asc",
+             source  => "puppet:///modules/buildd/buildd.debian.org.asc",
              mode    => 664,
              notify  => Exec["apt-keys-update"],
              ;
         "/etc/schroot/mount-defaults":
-             source  => "puppet:///buildd/mount-defaults",
+             content => template("buildd/etc/schroot/mount-defaults.erb"),
              require => Package["sbuild"]
              ;
         "/etc/cron.d/dsa-buildd":
-             source => "puppet:///buildd/cron.d-dsa-buildd",
-             require => Package["cron"]
+             source => "puppet:///modules/buildd/cron.d-dsa-buildd",
+             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 {
+        Linux: { linux_module { "dm_snapshot": ensure => present; } }
     }
+
 }
 # vim:set et:
 # vim:set sts=4 ts=4: