From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 10 Sep 2019 11:27:16 +0000 (+0200)
Subject: debian_org::apt: Retire some <= Debian8(jessie) codepaths
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6aa222e15c4655649ddb3e097f42519b50782d8b;p=mirror%2Fdsa-puppet.git

debian_org::apt: Retire some <= Debian8(jessie) codepaths
---

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 8ff087746..5d5b6afa6 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -3,11 +3,7 @@
 # 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/'
-	}
+	$fallbackmirror = 'http://deb.debian.org/debian/'
 
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
 		$mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror ]
@@ -31,18 +27,10 @@ class debian_org::apt {
 		}
 	}
 
-	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