X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=2809094c486fcfd2d77fbd15b60b980f9d600dce;hb=9adac73b4694331d17e0e44ecad9dfbc48d974bf;hp=e168abc33354cf6d6e07e768d6458361ca5857fc;hpb=e079e7b6a8002a0e185e904e7b4ccf762ab8746d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index e168abc33..2809094c4 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -23,6 +23,13 @@ class buildd ($ensure=present) {
 			source  => 'puppet:///modules/buildd/dupload.conf',
 			require => Package['dupload'],
 		}
+		package { 'buildd':
+			ensure => installed,
+		}
+		file { '/etc/buildd/buildd.conf':
+			source  => 'puppet:///modules/buildd/buildd.conf',
+			require => Package['buildd'],
+		}
 		site::linux_module { 'dm_snapshot': }
 		include ferm::ftp_conntrack
 	}
@@ -32,30 +39,28 @@ class buildd ($ensure=present) {
 	}
 
 	$suite = $::lsbdistcodename ? {
-		squeeze  => $::lsbdistcodename,
 		wheezy   => $::lsbdistcodename,
 		jessie   => $::lsbdistcodename,
 		stretch  => $::lsbdistcodename,
-		undef   => 'squeeze',
-		default => 'wheezy'
+		undef   => 'wheezy',
+		default => 'jessie'
 	}
 
-	$buildd_apt_main_ensure = $::hostname ? {
-		/^(schroeder|sompek|stadler)$/ => 'absent',
-		default => 'present',
+	$buildd_apt_url = $::debarchitecture ? {
+		/^sparc$/ => 'http://buildd.debian.org/apt/',
+		default   => 'https://buildd.debian.org/apt/',
 	}
 
 	site::aptrepo { 'buildd.debian.org':
-		ensure     => $buildd_apt_main_ensure,
 		key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
-		url        => 'https://buildd.debian.org/apt/',
+		url        => $buildd_apt_url,
 		suite      => $suite,
 		components => 'main',
 		require    => Package['apt-transport-https'],
 	}
 
 	$buildd_prop_ensure = $::hostname ? {
-		/^(alkman|zandonai)$/ => 'present',
+		/^(alkman)$/ => 'present',
 		default => 'absent',
 	}
 
@@ -89,7 +94,7 @@ class buildd ($ensure=present) {
 		require => Package['debian.org']
 	}
 
-	if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
+	if ($::kernel == 'Linux') {
 		package { 'python-psutil':
 			ensure => installed,
 		}
@@ -116,7 +121,7 @@ class buildd ($ensure=present) {
 
 	if $has_srv_buildd {
 		file { '/etc/cron.d/puppet-update-buildd-schroots':
-			content  => "13 21 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
+			content  => "13 21 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
 		}
 	}
 
@@ -173,6 +178,17 @@ class buildd ($ensure=present) {
 		group   => buildd,
 		owner   => buildd,
 	}
+	file { '/home/buildd/.gnupg':
+		ensure  => directory,
+		mode    => '700',
+		group   => buildd,
+		owner   => buildd,
+	}
+	file { '/home/buildd/.gnupg/gpg.conf':
+		content  => "personal-digest-preferences SHA512\n",
+		group   => buildd,
+		owner   => buildd,
+	}
 
 	if ! $::buildd_key {
 		exec { 'create-buildd-key':