X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=fc3e21d99966bd480a34e54d1c033f78fa350e7b;hb=1c7a4178f4687fd07825eac48ef8d2829a67719b;hp=364267a716a6d4184625288774998f317f175e9d;hpb=fa4000517ba3ff1344bb0b9fdc186708d740bc4a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 364267a71..fc3e21d99 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -2,21 +2,30 @@ class buildd {
 
 	# sigh, sort this mess out, kids
 	if $::lsbdistcodename in [lenny,squeeze] {
-		package { 'schroot': ensure => installed }
+		package { 'schroot':
+			ensure => installed,
+		}
 	} else {
-		package { 'schroot': ensure => held }
+		// package { 'schroot': ensure => held }
 	}
 
+	package { 'apt-transport-https':
+		ensure => installed,
+	}
 	package { [
 			'sbuild',
-			'apt-transport-https',
 			'debootstrap',
 			'dupload'
 		]:
-			ensure => installed
+		ensure => installed,
+		require => [
+			File['/etc/apt/sources.list.d/db.debian.org.list'],
+			Exec['apt-get update']
+		]
 	}
 
 	site::linux_module { 'dm_snapshot': }
+	ferm::module { 'nf_conntrack_ftp': }
 
 	site::aptrepo { 'buildd':
 		ensure => absent,
@@ -24,10 +33,17 @@ class buildd {
 	site::aptrepo { 'buildd.debian.org':
 		template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
 		key      => 'puppet:///modules/buildd/buildd.debian.org.asc',
+		require  => Package['apt-transport-https'],
 	}
 
-	file { '/etc/apt/preferences.d/buildd':
-		ensure  => absent
+	# "bad" extension
+	file { '/etc/apt/preferences.d/buildd.debian.org':
+		ensure => absent,
+	}
+	file { '/etc/apt/preferences.d/buildd.debian.org':
+		content => template('buildd/etc/apt/preferences.d/buildd'),
+		before  => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
+		;
 	}
 	file { '/etc/schroot/mount-defaults':
 		content => template('buildd/etc/schroot/mount-defaults.erb'),