From e79ced559062b830293c0a9385b8ab4c53b1c44d Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 8 Nov 2016 21:18:02 +0100
Subject: [PATCH] switch buildd repo to apt.buildd.debian.org

---
 modules/buildd/manifests/init.pp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 780e1bda2..5bc5cc5af 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -57,27 +57,16 @@ class buildd ($ensure=present) {
 			default => 'jessie'
 		}
 
-		$buildd_apt_url = $::debarchitecture ? {
-			/^sparc$/ => 'http://buildd.debian.org/apt/',
-			default   => 'https://buildd.debian.org/apt/',
-		}
-
 		site::aptrepo { 'buildd.debian.org':
 			key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
-			url        => $buildd_apt_url,
+			url        => 'https://apt.buildd.debian.org/'
 			suite      => $suite,
 			components => 'main',
 			require    => Package['apt-transport-https'],
 		}
 
-		if ($::lsbmajdistrelease >= 8) {
-			file { '/etc/apt/apt.conf.d/puppet-https-buildd':
-				content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
-			}
-		} 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",
-			}
+		file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+			content => "Acquire::https::apt.buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
 		}
 
 		# 'bad' extension
-- 
2.20.1