X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=7977b11ad80b2a9cbe1af839a8aced895beb43ed;hb=29391766483f14c896ba705c9fe657bc88c8d76e;hp=825f436b3b32340e7b2dca35662ac8fac7ccefa3;hpb=ee36bdfbb7ad677b199c6b600370f8db6fad4e24;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 825f436b3..7977b11ad 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,8 +1,8 @@
 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;
    }
@@ -10,13 +10,18 @@ class buildd {
    file {
       "/etc/apt/sources.list.d/buildd.list":
              source => "puppet:///files/etc/apt/sources.list.d/buildd.list",
-             require => Package["apt-transport-https"]
+             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["updatekeys"],
-          ;
+      "/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"]
+            ;
    }
 }