X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;h=c46c72f40ca4312bcd673784cbe7db47d71018e2;hb=c8178a26d055a8bd41d12036d3378f9833a99aa8;hp=8ff0877463024caa2b09aa71dfc27d97b3cc1a22;hpb=9c6e5abb124b6664dea47f2637e431286433b677;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 8ff087746..c46c72f40 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -3,46 +3,18 @@
 # Stuff common to all debian.org servers
 #
 class debian_org::apt {
-	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-		$fallbackmirror = 'http://cdn-fastly.deb.debian.org/debian/'
-	} else {
-		$fallbackmirror = 'http://deb.debian.org/debian/'
-	}
+	$mirror = lookup('apt::sources::debian::location')
 
-	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-		$mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror ]
-	} else {
-		$mirror = [ $fallbackmirror ]
+	base::aptrepo { 'debian':
+		url        => $mirror,
+		suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
+		components => ['main','contrib','non-free']
 	}
 
-	# jessie
-	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-		base::aptrepo { 'debian':
-			url        => $mirror,
-			suite      => [ $::lsbdistcodename ],
-			components => ['main','contrib','non-free']
-		}
-	# stretch or buster
-	} else {
-		base::aptrepo { 'debian':
-			url        => $mirror,
-			suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
-			components => ['main','contrib','non-free']
-		}
-	}
-
-	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-		base::aptrepo { 'security':
-			url        => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
-			suite      => "${::lsbdistcodename}/updates",
-			components => ['main','contrib','non-free']
-		}
-	} else {
-		base::aptrepo { 'security':
-			url        => [ 'http://security.debian.org/' ],
-			suite      => "${::lsbdistcodename}/updates",
-			components => ['main','contrib','non-free']
-		}
+	base::aptrepo { 'security':
+		url        => [ 'http://security.debian.org/' ],
+		suite      => "${::lsbdistcodename}/updates",
+		components => ['main','contrib','non-free']
 	}
 
 	# ca-certificates is installed by the ssl module
@@ -133,12 +105,7 @@ class debian_org::apt {
 		source => 'puppet:///modules/debian_org/apt.conf.d/local-cainfo',
 	}
 	file { '/etc/apt/apt.conf.d/local-pkglist':
-		source => 'puppet:///modules/debian_org/apt.conf.d/local-pkglist',
-	}
-
-	exec { 'dpkg list':
-		command => 'dpkg-query -W -f \'${Package}\n\' > /var/lib/misc/thishost/pkglist',
-		creates => '/var/lib/misc/thishost/pkglist',
+		ensure => 'absent',
 	}
 
 	exec { 'apt-get update':