X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;h=c46c72f40ca4312bcd673784cbe7db47d71018e2;hb=4180b5c1cd92468768efeb6bc52a3be3e59d2617;hp=5d5b6afa628cb791d8374310857815680e282ffc;hpb=6aa222e15c4655649ddb3e097f42519b50782d8b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 5d5b6afa6..c46c72f40 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -3,28 +3,12 @@
 # Stuff common to all debian.org servers
 #
 class debian_org::apt {
-	$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 ]
-	}
-
-	# 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']
-		}
+	base::aptrepo { 'debian':
+		url        => $mirror,
+		suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
+		components => ['main','contrib','non-free']
 	}
 
 	base::aptrepo { 'security':
@@ -121,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':