X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=0835e571738bee3c76e3a09ade9fd2c3925ebf08;hb=c82da35202608f408d60e3f189bfb5660bcd91dd;hp=bdb29eb8593b14faecfc72322b155111ed3b9394;hpb=0be9422d4562bc170c8bcf0726dff6485ef0459f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index bdb29eb85..0835e5717 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,13 +37,17 @@ class buildd {
 		require  => Package['apt-transport-https'],
 	}
 
-	file { '/etc/apt/preferences.d/buildd':
+	# '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.debian.org'),
-		before  => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
-		;
+	file { '/etc/apt/preferences.d':
+		ensure => directory,
+		mode   => '0755'
+	}
+	file { '/etc/apt/preferences.d/buildd':
+		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'),