X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=79065a17c45a28aa501df88b96bc9c3ee90f3c4a;hb=6e991e41c587e8e276825afaa174d6420c1d4e9d;hp=a7c70110d2616346cb086f35d7569ee67d27b10f;hpb=f333d2e3ec56c65b8f318f6e92c86462f1c91897;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index a7c70110d..79065a17c 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,6 +1,13 @@
 class buildd {
+
+	# sigh, sort this mess out, kids
+	if $::lsbdistcodename in [lenny,squeeze] {
+		package { 'schroot': ensure => installed }
+	} else {
+		package { 'schroot': ensure => held }
+	}
+
 	package { [
-			'schroot',
 			'sbuild',
 			'apt-transport-https',
 			'debootstrap',
@@ -10,10 +17,14 @@ class buildd {
 	}
 
 	site::linux_module { 'dm_snapshot': }
+	ferm::module { 'nf_conntrack_ftp': }
 
 	site::aptrepo { 'buildd':
-		content => template('buildd/etc/apt/sources.list.d/buildd.list.erb'),
-		key     => 'puppet:///modules/buildd/buildd.debian.org.asc',
+		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':