From: Julien Cristau <jcristau@debian.org>
Date: Wed, 28 Nov 2018 10:30:56 +0000 (+0100)
Subject: Use https to access the db.d.o repo
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e9ebef450d0d6443fa0070ec30e4a40a23ca99fe;p=mirror%2Fdsa-puppet.git

Use https to access the db.d.o repo
---

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 32a1fa82d..076463c36 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -35,9 +35,20 @@ class debian_org::apt {
 		}
 	}
 
+	# ca-certificates is installed by the ssl module
+	if versioncmp($::lsbmajdistrelease, '9') <= 0 {
+		package { 'apt-transport-https':
+			ensure => installed,
+		}
+	} else {
+		# transitional package in buster
+		package { 'apt-transport-https':
+			ensure => purged,
+		}
+	}
 	$dbdosuites = [ 'debian-all', $::lsbdistcodename ]
 	site::aptrepo { 'db.debian.org':
-		url        => 'http://db.debian.org/debian-admin',
+		url        => 'https://db.debian.org/debian-admin',
 		suite      => $dbdosuites,
 		components => 'main',
 		key        => 'puppet:///modules/debian_org/db.debian.org.gpg',