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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index b5ec5806c..f001291bd 100644
--- 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"],
              ;
-       
+
         "/etc/apt/trusted-keys.d/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:///modules/buildd/mount-defaults",
+             content => template("buildd/etc/schroot/mount-defaults.erb"),
              require => Package["sbuild"]
              ;
         "/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 {
+        Linux: { linux_module { "dm_snapshot": ensure => present; } }
     }
+
 }
 # vim:set et:
 # vim:set sts=4 ts=4: