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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 0835e5717..c17096326 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -6,7 +6,7 @@ class buildd {
 		]:
 		ensure  => installed,
 		require => [
-			File['etc/apt/sources.list.d/buildd.debian.org.list'],
+			File['/etc/apt/sources.list.d/buildd.debian.org.list'],
 			Exec['apt-get update']
 		]
 	}
@@ -19,10 +19,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,23 +27,46 @@ class buildd {
 	site::aptrepo { 'buildd':
 		ensure => absent,
 	}
+
+	if $::lsbdistcodename in [squeeze,wheezy] {
+		$suite = $::lsbdistcodename
+	} else {
+		$suite = 'wheezy'
+	}
+
 	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'],
+		key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
+		url        => 'https://buildd.debian.org/apt/',
+		suite      => $suite,
+		components => 'main',
+		require    => Package['apt-transport-https'],
+	}
+
+	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':
 		ensure => absent,
 	}
-	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']
+		before  => File['/etc/apt/sources.list.d/buildd.debian.org.list']
 	}
 	file { '/etc/schroot/mount-defaults':
 		content => template('buildd/etc/schroot/mount-defaults.erb'),