Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 8ca128e..7ddd769 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,22 +1,31 @@
 class buildd {
    package {
-     "sbuild": ensure => latest;
-     "buildd": ensure => latest;
-     "buildd-builder-meta": ensure => latest;
+     "sbuild": ensure => installed;
+     "buildd": ensure => installed;
+     "buildd-builder-meta": ensure => installed;
      "apt-transport-https": ensure => installed;
      "debootstrap": ensure => installed;
    }
 
    file {
       "/etc/apt/sources.list.d/buildd.list":
-             source => "puppet:///files/etc/apt/sources.list.d/buildd.list",
-             require => Package["apt-transport-https"]
+             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:///buildd/buildd.debian.org.asc",
-          mode    => 664,
-          notify  => Exec["apt-keys-update"],
-          ;
+      "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
+            source  => "puppet:///buildd/buildd.debian.org.asc",
+            mode    => 664,
+            notify  => Exec["apt-keys-update"],
+            ;
+      "/etc/schroot/mount-defaults":
+            source  => "puppet:///buildd/mount-defaults",
+            require => Package["sbuild"]
+            ;
+      "/etc/cron.d/dsa-buildd":
+            source => "puppet:///buildd/cron.d-dsa-buildd",
+            require => Package["cron"]
+            ;
    }
 }