X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=7b49fdfe67d4807a7c40fd78476c65dbbc8d7e94;hb=ca3d855e37df6d73833c766f9a2a7bd5ac4c0402;hp=87ea915c98715225f56f60e84f42f9889ed3bdc8;hpb=4bfaf9f2c5dd881ea65c4f564a4c3720a4e8df82;p=dsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 87ea915c..7b49fdfe 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,39 +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,
-	}
-	package { [
-			'debootstrap',
-			'dupload'
-		]:
 		ensure => installed,
 	}
-
-	site::linux_module { 'dm_snapshot':
-		ensure => $ensure
-	}
-	ferm::module { 'nf_conntrack_ftp':
-		ensure => $ensure
+	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': }
+		include ferm::ftp_conntrack
 	}
 
 	site::aptrepo { 'buildd':
@@ -48,30 +39,29 @@ class buildd ($ensure=present) {
 	}
 
 	site::aptrepo { 'buildd.debian.org':
-		ensure     => $ensure,
-		key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
+		key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
 		url        => 'https://buildd.debian.org/apt/',
 		suite      => $suite,
 		components => 'main',
 		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'],
-		}
+	$buildd_prop_ensure = $::hostname ? {
+		/^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+		default => 'absent',
 	}
 
-	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'],
-		}
+	file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+		content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/certs/buildd.debian.org.crt\";\n",
+		#require => File['/etc/ssl/certs/buildd.debian.org.crt']
+	}
+	site::aptrepo { 'buildd.debian.org-proposed':
+		ensure     => $buildd_prop_ensure,
+		url        => 'https://buildd.debian.org/apt/',
+		suite      => "${suite}-proposed",
+		components => 'main',
+		require    => [ Package['apt-transport-https'],
+		                File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
 	}
 
 	# 'bad' extension
@@ -79,28 +69,28 @@ 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'],
+		ensure => absent,
 	}
 	file { '/etc/cron.d/dsa-buildd':
-		ensure  => $ensure,
 		source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
 		require => Package['debian.org']
 	}
-	file { '/etc/dupload.conf':
-		ensure  => $ensure,
-		source  => 'puppet:///modules/buildd/dupload.conf',
-		require => Package['dupload'],
+
+	if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
+		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/default/schroot':
-		ensure  => $ensure,
-		source  => 'puppet:///modules/buildd/default-schroot',
-		require => Package['schroot']
+	file { '/etc/cron.d/puppet-buildd-aptitude':
+		content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
 	}
 }