X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=de1affe185b0e02952c47a3e9256849dc97c0d64;hb=65631b991bcf0afa575084f1c42475e77c22f7d8;hp=7eccfad7c420295afa6b478fb1c97af7fe2623c6;hpb=7f9077fbf57d3811b2b28b6d40a5720fd78ebf5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 7eccfad7c..de1affe18 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -39,7 +39,7 @@ class buildd ($ensure=present) {
 	}
 
 	site::aptrepo { 'buildd.debian.org':
-		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',
@@ -47,12 +47,12 @@ class buildd ($ensure=present) {
 	}
 
 	$buildd_prop_ensure = $::hostname ? {
-		/^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+		/^(alkman|brahms|porpora|zandonai)$/ => 'present',
 		default => 'absent',
 	}
 
 	file { '/etc/apt/apt.conf.d/puppet-https-buildd':
-		content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/certs/buildd.debian.org.crt\";\n",
+		content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/servicecerts/buildd.debian.org.crt\";\n",
 		#require => File['/etc/ssl/certs/buildd.debian.org.crt']
 	}
 	site::aptrepo { 'buildd.debian.org-proposed':