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

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index f7f113bdc..8ff087746 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -17,35 +17,28 @@ class debian_org::apt {
 
 	# jessie
 	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-		site::aptrepo { 'debian':
+		base::aptrepo { 'debian':
 			url        => $mirror,
 			suite      => [ $::lsbdistcodename ],
 			components => ['main','contrib','non-free']
 		}
-	# stretch
-	} elsif versioncmp($::lsbmajdistrelease, '9') <= 0 {
-		site::aptrepo { 'debian':
-			url        => $mirror,
-			suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
-			components => ['main','contrib','non-free']
-		}
-	# buster or newer
+	# stretch or buster
 	} else {
-		site::aptrepo { 'debian':
+		base::aptrepo { 'debian':
 			url        => $mirror,
-			suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-updates" ],
+			suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
 			components => ['main','contrib','non-free']
 		}
 	}
 
 	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-		site::aptrepo { 'security':
+		base::aptrepo { 'security':
 			url        => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
 			suite      => "${::lsbdistcodename}/updates",
 			components => ['main','contrib','non-free']
 		}
 	} else {
-		site::aptrepo { 'security':
+		base::aptrepo { 'security':
 			url        => [ 'http://security.debian.org/' ],
 			suite      => "${::lsbdistcodename}/updates",
 			components => ['main','contrib','non-free']
@@ -64,7 +57,7 @@ class debian_org::apt {
 		}
 	}
 	$dbdosuites = [ 'debian-all', $::lsbdistcodename ]
-	site::aptrepo { 'db.debian.org':
+	base::aptrepo { 'db.debian.org':
 		url        => 'https://db.debian.org/debian-admin',
 		suite      => $dbdosuites,
 		components => 'main',
@@ -72,39 +65,39 @@ class debian_org::apt {
 	}
 
 	if ($::hostname in []) {
-		site::aptrepo { 'proposed-updates':
+		base::aptrepo { 'proposed-updates':
 			url        => $mirror,
 			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,
 	}
 
@@ -139,6 +132,14 @@ class debian_org::apt {
 	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':
+		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',
+	}
 
 	exec { 'apt-get update':
 		path    => '/usr/bin:/usr/sbin:/bin:/sbin',