X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=02231fe5ea5baf576e4b12cb7e871d2f8577a0d8;hb=f7318438034afccb3b83c7cc5be01834be56fb77;hp=335da3f012bbbf9936923da858e6a844326ec9cf;hpb=f9f51fcde982ad009bf96b8898d310a401583173;p=dsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 335da3f0..02231fe5 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,28 +1,31 @@
-class buildd {
+class buildd ($ensure=present) {
 
-	package { [
-			'schroot',
-			'sbuild'
-		]:
-		ensure  => installed,
-		require => [
-			File['/etc/apt/sources.list.d/buildd.debian.org.list'],
-			Exec['apt-get update']
-		]
-	}
+	include schroot
 
-	package { 'apt-transport-https':
+	package { 'sbuild':
 		ensure => installed,
+		tag    => extra_repo,
 	}
-	package { [
-			'debootstrap',
-			'dupload'
-		]:
+	package { 'libsbuild-perl':
 		ensure => installed,
+		tag    => extra_repo,
+		before => Package['sbuild']
 	}
 
-	site::linux_module { 'dm_snapshot': }
-	ferm::module { 'nf_conntrack_ftp': }
+	package { 'apt-transport-https':
+		ensure => installed,
+	}
+	if $ensure == present {
+		package { 'dupload':
+			ensure => installed,
+		}
+		file { '/etc/dupload.conf':
+			source  => 'puppet:///modules/buildd/dupload.conf',
+			require => Package['dupload'],
+		}
+		site::linux_module { 'dm_snapshot': }
+		ferm::module { 'nf_conntrack_ftp': }
+	}
 
 	site::aptrepo { 'buildd':
 		ensure => absent,
@@ -30,8 +33,8 @@ class buildd {
 
 	$suite = $::lsbdistcodename ? {
 		squeeze => $::lsbdistcodename,
-		wheezy => $::lsbdistcodename,
-		undef => 'squeeze',
+		wheezy  => $::lsbdistcodename,
+		undef   => 'squeeze',
 		default => 'wheezy'
 	}
 
@@ -67,23 +70,23 @@ class buildd {
 	}
 	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'),
-		require => Package['sbuild'],
+		before  => Site::Aptrepo['buildd.debian.org']
 	}
 	file { '/etc/cron.d/dsa-buildd':
 		source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
 		require => Package['debian.org']
 	}
-	file { '/etc/dupload.conf':
-		source  => 'puppet:///modules/buildd/dupload.conf',
-		require => Package['dupload'],
-	}
-	file { '/etc/default/schroot':
-		source  => 'puppet:///modules/buildd/default-schroot',
-		require => Package['schroot']
-	}
 
+	if $::lsbmajdistrelease >= 7 {
+		package { 'python-psutil':
+			ensure => installed,
+		}
+		file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+			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",
+		}
+	}
 }