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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index de1affe18..d54057176 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -51,9 +51,15 @@ class buildd ($ensure=present) {
 		default => 'absent',
 	}
 
-	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']
+	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,