X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;h=62feca2f48a02136e3c40ae9d7d3ec5bc4db99e6;hb=ac16f1a5f660d81a5eeae6682c94db835768ae0d;hp=703cafc42efa38062ef8baa3e3cf90912068f85e;hpb=bbaef03179a8a061ba588c934307b1afb541bd50;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 703cafc42..62feca2f4 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -15,17 +15,23 @@ class debian_org::apt {
 		$mirror = [ $fallbackmirror ]
 	}
 
-	site::aptrepo { 'debian':
-		url        => $mirror,
-		suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
-		components => ['main','contrib','non-free']
+	# jessie
+	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
+		site::aptrepo { 'debian':
+			url        => $mirror,
+			suite      => [ $::lsbdistcodename ],
+			components => ['main','contrib','non-free']
+		}
+	# stretch or buster
+	} else {
+		site::aptrepo { 'debian':
+			url        => $mirror,
+			suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
+			components => ['main','contrib','non-free']
+		}
 	}
 
-	if ($::hostname in [smetana]) {
-		site::aptrepo { 'security':
-			ensure => absent,
-		}
-	} elsif versioncmp($::lsbmajdistrelease, '8') <= 0 {
+	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
 		site::aptrepo { 'security':
 			url        => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
 			suite      => "${::lsbdistcodename}/updates",
@@ -39,9 +45,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',
@@ -112,6 +129,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',