From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 8 Apr 2019 19:14:17 +0000 (+0200)
Subject: Enable backports on buster
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ac16f1a5f660d81a5eeae6682c94db835768ae0d;p=mirror%2Fdsa-puppet.git

Enable backports on buster
---

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index f7f113bdc..62feca2f4 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -22,18 +22,11 @@ class debian_org::apt {
 			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':
 			url        => $mirror,
-			suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-updates" ],
+			suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
 			components => ['main','contrib','non-free']
 		}
 	}