X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=2248409ddaaae1115a7479fe14d18aca048166c6;hb=e4ee37b30124a628c66554e9a4b2789b9f8afee3;hp=01dca34d5b315b03a4238547d82b90b34743ff3b;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 01dca34d5..2248409dd 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,27 +1,53 @@
 class buildd {
+
+	# sigh, sort this mess out, kids
+	if $::lsbdistcodename in [lenny,squeeze] {
+		package { 'schroot':
+			ensure => installed,
+			require => [
+				File['/etc/apt/sources.list.d/db.debian.org.list'],
+				Exec['apt-get update']
+			]
+		}
+	} else {
+		package { 'schroot': ensure => held }
+	}
+
+	package { 'apt-transport-https':
+		ensure => installed,
+	}
 	package { [
-			'schroot',
 			'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':
-		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',
+		require  => Package['apt-transport-https'],
 	}
 
 	file { '/etc/apt/preferences.d/buildd':
-		ensure  => absent
+		ensure => absent,
 	}
-	file { '/etc/schroot/mount-defaults':
-		content => template('buildd/etc/schroot/mount-defaults.erb'),
-		require => Package['sbuild'],
+	file { '/etc/apt/preferences.d/buildd.debian.org':
+		source  => "puppet:///modules/buildd/apt-preferences",
+		content => template('buildd/etc/apt/preferences.d/buildd.debian.org'),
+		before  => File["/etc/apt/sources.list.d/buildd.list"],
+		;
 	}
 	file { '/etc/schroot/mount-defaults':
 		content => template('buildd/etc/schroot/mount-defaults.erb'),