X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=8f2065de47e8d4ad508626f0f4f4e05c9558c702;hb=59963405a47cc9a41af273aff5cac242af17a018;hp=bc0057bdbdee9f0e6fab387ab70b23b0ef231023;hpb=5dfafc37def6b56da67fd218ab542032832cc7e8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index bc0057bdb..8f2065de4 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,40 +1,50 @@
 class buildd {
-   package { "sbuild": ensure => latest;
-# is there a way to wait until the version from buildd.d.o is available?
-   }
-   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";
-             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-----
-#
 
+	# sigh, sort this mess out, kids
+	if $::lsbdistcodename in [lenny,squeeze] {
+		package { 'schroot': ensure => installed }
+	} else {
+		package { 'schroot': ensure => held }
+	}
 
+	package { [
+			'sbuild',
+			'apt-transport-https',
+			'debootstrap',
+			'dupload'
+		]:
+			ensure => installed
+	}
+
+	site::linux_module { 'dm_snapshot': }
+	ferm::module { 'ftp_conntrack': }
+
+	site::aptrepo { 'buildd':
+		ensure => absent,
+	}
+	site::aptrepo { 'buildd.debian.org':
+		template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
+		key      => 'puppet:///modules/buildd/buildd.debian.org.asc',
+	}
+
+	file { '/etc/apt/preferences.d/buildd':
+		ensure  => absent
+	}
+	file { '/etc/schroot/mount-defaults':
+		content => template('buildd/etc/schroot/mount-defaults.erb'),
+		require => Package['sbuild'],
+	}
+	file { '/etc/cron.d/dsa-buildd':
+		source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
+		require => Package['debian.org']
+	}
+	file { '/etc/dupload.conf':
+		source  => 'puppet:///modules/buildd/dupload.conf',
+		require => Package['dupload'],
+	}
+	file { '/etc/default/schroot':
+		source  => 'puppet:///modules/buildd/default-schroot',
+		require => Package['schroot']
+	}
 
 }