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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 3a9d5087..02231fe5 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,9 +1,7 @@
-class buildd {
+class buildd ($ensure=present) {
+
+	include schroot
 
-	package { 'schroot':
-		ensure => installed,
-		tag    => extra_repo,
-	}
 	package { 'sbuild':
 		ensure => installed,
 		tag    => extra_repo,
@@ -17,16 +15,18 @@ class buildd {
 	package { 'apt-transport-https':
 		ensure => installed,
 	}
-	package { [
-			'debootstrap',
-			'dupload'
-		]:
-		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::linux_module { 'dm_snapshot': }
-	ferm::module { 'nf_conntrack_ftp': }
-
 	site::aptrepo { 'buildd':
 		ensure => absent,
 	}
@@ -72,21 +72,21 @@ class buildd {
 		content => template('buildd/etc/apt/preferences.d/buildd'),
 		before  => Site::Aptrepo['buildd.debian.org']
 	}
-	file { '/etc/schroot/mount-defaults':
-		content => template('buildd/etc/schroot/mount-defaults.erb'),
-		require => Package['sbuild'],
-	}
 	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",
+		}
+	}
 }