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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 4fd831ee4..2809094c4 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -39,12 +39,11 @@ class buildd ($ensure=present) {
 	}
 
 	$suite = $::lsbdistcodename ? {
-		squeeze  => $::lsbdistcodename,
 		wheezy   => $::lsbdistcodename,
 		jessie   => $::lsbdistcodename,
 		stretch  => $::lsbdistcodename,
-		undef   => 'squeeze',
-		default => 'wheezy'
+		undef   => 'wheezy',
+		default => 'jessie'
 	}
 
 	$buildd_apt_url = $::debarchitecture ? {
@@ -95,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,
 		}
@@ -122,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",
 		}
 	}
 
@@ -179,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':