X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;h=c46c72f40ca4312bcd673784cbe7db47d71018e2;hb=4b84b19c56499b324af5f25a5fd5ce300db34d0e;hp=948f606eaa3d96f54f01a426131596fd36164135;hpb=4b0d5b04319abfcdd5ef3a80b31f7728900f358e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 948f606ea..c46c72f40 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -3,83 +3,73 @@
 # Stuff common to all debian.org servers
 #
 class debian_org::apt {
-	if versioncmp($::lsbmajdistrelease, '7') <= 0 {
-		$mungedcodename = $::lsbdistcodename
-	} elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-		$mungedcodename = "${::lsbdistcodename}-kfreebsd"
-	} else {
-		$mungedcodename = $::lsbdistcodename
-	}
+	$mirror = lookup('apt::sources::debian::location')
 
-	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-		$fallbackmirror = 'http://cdn-fastly.deb.debian.org/debian/'
-	} else {
-		$fallbackmirror = 'http://deb.debian.org/debian/'
-	}
-
-	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-		$mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror, 'http://debian.anycast-test.mirrors.debian.org/debian/' ]
-	} else {
-		$mirror = [ $fallbackmirror, 'http://debian.anycast-test.mirrors.debian.org/debian/' ]
-	}
-
-	site::aptrepo { 'debian':
+	base::aptrepo { 'debian':
 		url        => $mirror,
-		suite      => [ $mungedcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
+		suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
 		components => ['main','contrib','non-free']
 	}
-	site::aptrepo { 'security':
-		url        => [ 'http://security-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security.debian.org/' ],
-		suite      => "${mungedcodename}/updates",
+
+	base::aptrepo { 'security':
+		url        => [ 'http://security.debian.org/' ],
+		suite      => "${::lsbdistcodename}/updates",
 		components => ['main','contrib','non-free']
 	}
 
-	if has_role('experimental_apache') {
-		$dbdosuites = [ 'debian-all', $::lsbdistcodename, 'jessie-apache2' ]
+	# ca-certificates is installed by the ssl module
+	if versioncmp($::lsbmajdistrelease, '9') <= 0 {
+		package { 'apt-transport-https':
+			ensure => installed,
+		}
 	} else {
-		$dbdosuites = [ 'debian-all', $::lsbdistcodename ]
+		# transitional package in buster
+		package { 'apt-transport-https':
+			ensure => purged,
+		}
 	}
-	site::aptrepo { 'db.debian.org':
-		url        => 'http://db.debian.org/debian-admin',
+	$dbdosuites = [ 'debian-all', $::lsbdistcodename ]
+	base::aptrepo { 'db.debian.org':
+		url        => 'https://db.debian.org/debian-admin',
 		suite      => $dbdosuites,
 		components => 'main',
 		key        => 'puppet:///modules/debian_org/db.debian.org.gpg',
 	}
 
-	if ($::hostname in [] or $::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-		site::aptrepo { 'proposed-updates':
+	if ($::hostname in []) {
+		base::aptrepo { 'proposed-updates':
 			url        => $mirror,
-			suite      => "${mungedcodename}-proposed-updates",
+			suite      => "${::lsbdistcodename}-proposed-updates",
 			components => ['main','contrib','non-free']
 		}
 	} else {
-		site::aptrepo { 'proposed-updates':
+		base::aptrepo { 'proposed-updates':
 			ensure => absent,
 		}
 	}
 
-	site::aptrepo { 'debian-cdn':
+	base::aptrepo { 'debian-cdn':
 		ensure => absent,
 	}
-	site::aptrepo { 'debian.org':
+	base::aptrepo { 'debian.org':
 		ensure => absent,
 	}
-	site::aptrepo { 'debian2':
+	base::aptrepo { 'debian2':
 		ensure => absent,
 	}
-	site::aptrepo { 'backports2.debian.org':
+	base::aptrepo { 'backports2.debian.org':
 		ensure => absent,
 	}
-	site::aptrepo { 'backports.debian.org':
+	base::aptrepo { 'backports.debian.org':
 		ensure => absent,
 	}
-	site::aptrepo { 'volatile':
+	base::aptrepo { 'volatile':
 		ensure => absent,
 	}
-	site::aptrepo { 'db.debian.org-suite':
+	base::aptrepo { 'db.debian.org-suite':
 		ensure => absent,
 	}
-	site::aptrepo { 'debian-lts':
+	base::aptrepo { 'debian-lts':
 		ensure => absent,
 	}
 
@@ -111,6 +101,12 @@ 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',
+	}
+	file { '/etc/apt/apt.conf.d/local-pkglist':
+		ensure => 'absent',
+	}
 
 	exec { 'apt-get update':
 		path    => '/usr/bin:/usr/sbin:/bin:/sbin',