X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=7b22eae1e56ae1662c28e27d50911bb5bd97313a;hb=f9d91d53528b62671c3ddaeb6f57b2eb4b713010;hp=ee60baa7fb7cfc2531b062fc8161565d535db5fa;hpb=5715c43a537e3db4c51ee698056b70435b3127a8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index ee60baa7f..7b22eae1e 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -61,7 +61,7 @@ class buildd ($ensure=present) {
 	}
 
 	$buildd_prop_ensure = $::hostname ? {
-		/^(alkman|zandonai)$/ => 'present',
+		/^(alkman)$/ => 'present',
 		default => 'absent',
 	}
 
@@ -122,7 +122,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 +179,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':