X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=da89852a37843244a3612dff7fbbccd1759b28c7;hb=6c1c2f664e94e83888d91953446c0aa6d0631a03;hp=16f844155a332d74bb0164ebbd8f0a907514d5e0;hpb=7f86914b9cb237cb1cf8c720f86902bef717cfaa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 16f844155..da89852a3 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -5,6 +5,7 @@ class buildd {
         "buildd-builder-meta": ensure => installed;
         "apt-transport-https": ensure => installed;
         "debootstrap": ensure => installed;
+        "dupload": ensure => installed;
     }
    
     file {
@@ -15,19 +16,28 @@ class buildd {
              ;
        
         "/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"]
+             ;
+    }
+
+    case $kernel {
+        Linux: { linux_module { "dm_snapshot": ensure => present; } }
     }
+
 }
 # vim:set et:
 # vim:set sts=4 ts=4: