X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;h=076463c36e62f65a241e132f5866e84ab008e9e3;hb=2e7ea5b5c1fd90631740fc204962b90a0409cceb;hp=cf1f72ffbf5af4b08208b85d97f64135282d329e;hpb=0a00448c29c7d319615ae3ac37346b1dda00204e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index cf1f72ffb..076463c36 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -21,21 +21,34 @@ class debian_org::apt {
 		components => ['main','contrib','non-free']
 	}
 
-	if ($::hostname in [smetana]) {
+	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
 		site::aptrepo { 'security':
-			ensure => absent,
+			url        => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
+			suite      => "${::lsbdistcodename}/updates",
+			components => ['main','contrib','non-free']
 		}
 	} else {
 		site::aptrepo { 'security':
-			url        => [ 'http://security-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security.debian.org/' ],
+			url        => [ 'http://security.debian.org/' ],
 			suite      => "${::lsbdistcodename}/updates",
 			components => ['main','contrib','non-free']
 		}
 	}
 
+	# 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',