X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=63c5cf8acc24b49e2e750286f1f3a5b9bca0a62a;hb=103e56b48752f77fd66edd1824d82946570ca033;hp=8f2065de47e8d4ad508626f0f4f4e05c9558c702;hpb=59963405a47cc9a41af273aff5cac242af17a018;p=dsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 8f2065de..63c5cf8a 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,23 +1,32 @@
 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'
+		]:
+		ensure  => installed,
+		require => [
+			File['/etc/apt/sources.list.d/buildd.debian.org.list'],
+			Exec['apt-get update']
+		]
 	}
 
+	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 { 'ftp_conntrack': }
+	ferm::module { 'nf_conntrack_ftp': }
 
 	site::aptrepo { 'buildd':
 		ensure => absent,
@@ -25,10 +34,16 @@ 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'],
 	}
 
+	# 'bad' extension
+	file { '/etc/apt/preferences.d/buildd.debian.org':
+		ensure => absent,
+	}
 	file { '/etc/apt/preferences.d/buildd':
-		ensure  => absent
+		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'),