X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=2ddf0663e779d29035051dacc8f3040bd7bd0185;hb=bb4a683ab024ec9a00e5d216861f321ecc2fb36c;hp=da13c77c6dc066b2b6f67ca6c4b4c18d7dd76b1d;hpb=c18af503e88887835256ea6558439ada751761d1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index da13c77c6..2ddf0663e 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -48,7 +48,7 @@ class buildd ($ensure=present) {
 
 	site::aptrepo { 'buildd.debian.org-proposed':
 		ensure     => $::hostname ? {
-		                             /^(alkman|porpora|zandonai)$/ => 'present',
+		                             /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
 		                             default => 'absent',
 		                            },
 		url        => 'https://buildd.debian.org/apt/',
@@ -57,31 +57,30 @@ class buildd ($ensure=present) {
 		require    => Package['apt-transport-https'],
 	}
 
-	site::aptrepo { 'buildd.debian.org-experimental':
-		ensure     => $::hostname ? {
-		                             /^(krenek)$/ => 'present',
-		                             default => 'absent',
-		                            },
-		url        => 'https://buildd.debian.org/apt/',
-		suite      => "${suite}-experimental",
-		components => 'main',
-		require    => Package['apt-transport-https'],
-	}
+	#site::aptrepo { 'buildd.debian.org-experimental':
+	#	ensure     => $::hostname ? {
+	#	                             /^(xxxx)$/ => 'present',
+	#	                             default => 'absent',
+	#	                            },
+	#	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/buildd':
-		content => template('buildd/etc/apt/preferences.d/buildd'),
-		before  => Site::Aptrepo['buildd.debian.org']
+		ensure => absent,
 	}
 	file { '/etc/cron.d/dsa-buildd':
 		source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
 		require => Package['debian.org']
 	}
 
-	if $::lsbmajdistrelease >= 7 {
+	if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
 		package { 'python-psutil':
 			ensure => installed,
 		}