From f7b6563588cf8a5395f155c1b225d2e96e77e02d Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 29 Nov 2014 09:44:25 +0100 Subject: [PATCH] apt/curl is broken in jessie #771404 --- modules/buildd/manifests/init.pp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index de1affe1..d5405717 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, -- 2.39.2