X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=4ded440f79d2dc5214722c51c4d6a354d777c99d;hb=d2f41d6cc64287591ac5c97a1fae9adb4f848d36;hp=63c5cf8acc24b49e2e750286f1f3a5b9bca0a62a;hpb=103e56b48752f77fd66edd1824d82946570ca033;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 63c5cf8ac..4ded440f7 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -6,7 +6,6 @@ class buildd {
 		]:
 		ensure  => installed,
 		require => [
-			File['/etc/apt/sources.list.d/buildd.debian.org.list'],
 			Exec['apt-get update']
 		]
 	}
@@ -19,10 +18,6 @@ class buildd {
 			'dupload'
 		]:
 		ensure => installed,
-		require => [
-			File['/etc/apt/sources.list.d/db.debian.org.list'],
-			Exec['apt-get update']
-		]
 	}
 
 	site::linux_module { 'dm_snapshot': }
@@ -31,10 +26,41 @@ 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'
+	}
+
+	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