X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=d5405717673c69772dda0902fd4926845afbd5aa;hb=f7b6563588cf8a5395f155c1b225d2e96e77e02d;hp=8d0b2c0e96052c53606869d483739934856e4cc9;hpb=963cd75a0593d779ff19090aab82ec22fbb6f971;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 8d0b2c0e9..d54057176 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,16 +47,27 @@ class buildd ($ensure=present) {
 	}
 
 	$buildd_prop_ensure = $::hostname ? {
-		/^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+		/^(alkman|brahms|porpora|zandonai)$/ => 'present',
 		default => 'absent',
 	}
 
+	if ($::lsbmajdistrelease >= 8) {
+		file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+			ensure => absent,
+		}
+	} else {
+		file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+			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':
 		ensure     => $buildd_prop_ensure,
 		url        => 'https://buildd.debian.org/apt/',
 		suite      => "${suite}-proposed",
 		components => 'main',
-		require    => Package['apt-transport-https'],
+		require    => [ Package['apt-transport-https'],
+		                File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
 	}
 
 	# 'bad' extension