X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=ec575bf8470b7b51d91e5a37f4ce1834903827a8;hb=99934ebb3a97a64a0d995792f65362e3d6778227;hp=2786d35072b582da9a2e0adddc60a8915368567f;hpb=ae0af8fdaba9c6e9e5396ec8f9b93aeeca7f21bf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 2786d3507..ec575bf84 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,46 +1,30 @@
 class buildd ($ensure=present) {
 
-	$package_ensure = $ensure ? {
-		present => installed,
-		absent  => $ensure
-	}
+	include schroot
 
-	package { 'schroot':
-		ensure => $package_ensure,
-		tag    => extra_repo,
-	}
 	package { 'sbuild':
-		ensure => $package_ensure,
+		ensure => installed,
 		tag    => extra_repo,
 	}
 	package { 'libsbuild-perl':
-		ensure => $package_ensure,
+		ensure => installed,
 		tag    => extra_repo,
 		before => Package['sbuild']
 	}
 
 	package { 'apt-transport-https':
-		ensure => $package_ensure,
+		ensure => installed,
 	}
 	if $ensure == present {
-		package { [
-				'debootstrap',
-				'dupload'
-			]:
+		package { 'dupload':
 			ensure => installed,
 		}
 		file { '/etc/dupload.conf':
-			ensure  => $ensure,
 			source  => 'puppet:///modules/buildd/dupload.conf',
 			require => Package['dupload'],
 		}
-	}
-
-	site::linux_module { 'dm_snapshot':
-		ensure => $ensure
-	}
-	ferm::module { 'nf_conntrack_ftp':
-		ensure => $ensure
+		site::linux_module { 'dm_snapshot': }
+		ferm::module { 'nf_conntrack_ftp': }
 	}
 
 	site::aptrepo { 'buildd':
@@ -55,7 +39,6 @@ class buildd ($ensure=present) {
 	}
 
 	site::aptrepo { 'buildd.debian.org':
-		ensure     => $ensure,
 		key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
 		url        => 'https://buildd.debian.org/apt/',
 		suite      => $suite,
@@ -86,23 +69,29 @@ class buildd ($ensure=present) {
 		ensure => absent,
 	}
 	file { '/etc/apt/preferences.d/buildd':
-		ensure  => $ensure,
 		content => template('buildd/etc/apt/preferences.d/buildd'),
 		before  => Site::Aptrepo['buildd.debian.org']
 	}
-	file { '/etc/schroot/mount-defaults':
-		ensure  => $ensure,
-		content => template('buildd/etc/schroot/mount-defaults.erb'),
-		require => Package['sbuild'],
-	}
 	file { '/etc/cron.d/dsa-buildd':
-		ensure  => $ensure,
 		source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
 		require => Package['debian.org']
 	}
-	file { '/etc/default/schroot':
-		ensure  => $ensure,
-		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',
+		}
+	} 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",
 	}
 }