X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=4ded440f79d2dc5214722c51c4d6a354d777c99d;hb=d2f41d6cc64287591ac5c97a1fae9adb4f848d36;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..4ded440f7 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,31 +1,23 @@
 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 => [
+			Exec['apt-get update']
+		]
 	}
 
 	package { 'apt-transport-https':
 		ensure => installed,
 	}
 	package { [
-			'sbuild',
 			'debootstrap',
 			'dupload'
 		]:
 		ensure => installed,
-		require => [
-			File['/etc/apt/sources.list.d/db.debian.org.list'],
-			Exec['apt-get update']
-		]
 	}
 
 	site::linux_module { 'dm_snapshot': }
@@ -34,19 +26,50 @@ class buildd {
 	site::aptrepo { 'buildd':
 		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'],
+
+	$suite = $::lsbdistcodename ? {
+		squeeze => $::lsbdistcodename,
+		wheezy  => $::lsbdistcodename,
+		undef   => 'squeeze',
+		default => 'wheezy'
 	}
 
-	file { '/etc/apt/preferences.d/buildd':
-		ensure => absent,
+	if $suite == 'squeeze' {
+		site::aptrepo { 'buildd.debian.org':
+			key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
+			url        => 'https://buildd.debian.org/apt/',
+			suite      => $suite,
+			components => 'main',
+			require    => Package['apt-transport-https'],
+			before     => Package[schroot,sbuild]
+		}
+	}
+
+	if $::hostname in [alkman,porpora,zandonai] {
+		site::aptrepo { 'buildd.debian.org-proposed':
+			url        => 'https://buildd.debian.org/apt/',
+			suite      => "${suite}-proposed",
+			components => 'main',
+			require    => Package['apt-transport-https'],
+		}
 	}
+
+	if $::hostname in [krenek] {
+		site::aptrepo { 'buildd.debian.org-experimental':
+			url        => 'https://buildd.debian.org/apt/',
+			suite      => "${suite}-experimental",
+			components => 'main',
+			require    => Package['apt-transport-https'],
+		}
+	}
+
+	# 'bad' extension
 	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"],
-		;
+		ensure => absent,
+	}
+	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'),