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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 009d9931..63c5cf8a 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,23 +1,20 @@
 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 { [
+			'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',
 			'debootstrap',
 			'dupload'
 		]:
@@ -40,10 +37,13 @@ class buildd {
 		require  => Package['apt-transport-https'],
 	}
 
+	# 'bad' extension
+	file { '/etc/apt/preferences.d/buildd.debian.org':
+		ensure => absent,
+	}
 	file { '/etc/apt/preferences.d/buildd':
-		source  => "puppet:///modules/buildd/apt-preferences",
-		before  => File["/etc/apt/sources.list.d/buildd.list"],
-		;
+		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'),