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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 02231fe5e..2ddf0663e 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -46,38 +46,41 @@ class buildd ($ensure=present) {
 		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'],
-		}
+	site::aptrepo { 'buildd.debian.org-proposed':
+		ensure     => $::hostname ? {
+		                             /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+		                             default => 'absent',
+		                            },
+		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'],
-		}
-	}
+	#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,
 		}
@@ -85,8 +88,13 @@ class buildd ($ensure=present) {
 			source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
 			mode    => '0555',
 		}
-		file { '/etc/cron.d/puppet-buildd-aptitude':
-			content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+	} else {
+		file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+			source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.squeeze',
+			mode    => '0555',
 		}
 	}
+	file { '/etc/cron.d/puppet-buildd-aptitude':
+		content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+	}
 }