X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=a5af7bedfde513a919df9bd730a046a0f2d51877;hb=bf6b1da5520ccce7b30b81e1f6cb0bb4619a48c2;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..a5af7bedf 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,10 +1,12 @@
 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 {
@@ -20,14 +22,27 @@ class buildd {
              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: