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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index be0580ae2..7977b11ad 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,40 +1,27 @@
-class debian-org {
-   package { "sbuild": ensure => latest;
-# is there a way to wait until the version from buildd.d.o is available?
+class buildd {
+   package {
+     "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":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
-             source => "puppet:///files/etc/apt/sources.list.d/buildd.list";
+             source => "puppet:///files/etc/apt/sources.list.d/buildd.list",
              require => Package["apt-transport-https"],
-   }
-# THIS IS NOT READY YET
-# also needs:
-#  apt key on the system:
-# -----BEGIN PGP PUBLIC KEY BLOCK-----
-# Version: GnuPG v1.4.9 (GNU/Linux)
-# 
-# mQENBEm1IOQBCAC2D/Q3tcB+/zRx8/O4ry4hvP3JTLB+zCXcyAcIyzPdgmxNXQUZ
-# IOPSIMluiJfh9Dbgwjxm9oWTkP2LobcfVzIlHA9nVonW42rhhaYJd7yQ8xQ6u15g
-# 7SPNO8b8yinqm+140Sh32PZj/5YGdFf1YpJ82la8PmNFkpLQlP+Kv2hzusun1/fQ
-# Ui8g81gHq+vO5XTKW06yMk87a4SHeSFEtxjIpivAx9iIpQCF8RmPs7+EbGpG1xpn
-# pjD8QMzmls8yPFl/0+xh+tvIZoGogIJHDo3I1vDEUuEMqoISnBB+BjWRrcJylQW0
-# mbNyiv2AJmNEZLZG3+0KdT9txs7ZKQfsSU6VABEBAAG0J2J1aWxkZC5kZWJpYW4u
-# b3JnIGFyY2hpdmUga2V5IDIwMDkvMjAxMIkBPAQTAQIAJgUCSbUg5AIbAwUJA8Jn
-# AAYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHxDG3/7kJSE/4gIAJXwWs1IaOVf
-# qkQpx+ijdyLqoZWpOYeX3Vo9FF2Lk/3+tBol8QFoQoSvrQWg+aP+SXlL1PzpEOvs
-# 87uqRzPvwK7B7eHlzY0mGpshXEGniHNVK4ZBh3svrVN3LwqV6lgHkNWZkBczDfvi
-# E8du/UXOL7lCADqjZCPRuwGPwkWp32MbZzwRHP0pRyXttRXTDUQXwM6TUhGaHxsB
-# A4K5AUsooz4PCpIiUwVmle7kGz+NrI+bbyFNJBGnSxwluxGsJayX9kaqbq9JDhsM
-# i+nhFOCOXomKSbJAaoQZnpGY4fFhk14UdM7EQ9CsEpvBu2CeZu2CibmDR8hPuGMV
-# duy/LOSZsT0=
-# =680o
-# -----END PGP PUBLIC KEY BLOCK-----
-#
-
-
+             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/schroot/mount-defaults":
+            source  => "puppet:///buildd/mount-defaults",
+            require => Package["sbuild"]
+            ;
+   }
 }