X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;h=43c9f4924062bc46b200041332ee2c05535e98b3;hb=8a2ead3c6f7a440c891891571a0203c7f9b254f7;hp=32a1fa82d6657b7e14614224a3c94f7d2d329db4;hpb=a1bdffc5a79688336ab1e65c67debf2550029c74;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 32a1fa82d..43c9f4924 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',
@@ -108,6 +119,9 @@ class debian_org::apt {
 	file { '/etc/apt/apt.conf.d/local-langs':
 		source => 'puppet:///modules/debian_org/apt.conf.d/local-langs',
 	}
+	file { '/etc/apt/apt.conf.d/local-cainfo':
+		source => 'puppet:///modules/debian_org/apt.conf.d/local-cainfo',
+	}
 
 	exec { 'apt-get update':
 		path    => '/usr/bin:/usr/sbin:/bin:/sbin',