From: Aurelien Jarno <aurelien@aurel32.net>
Date: Thu, 22 Feb 2018 22:24:26 +0000 (+0100)
Subject: Drop security-cdn.d.o on stretch
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bbaef03179a8a061ba588c934307b1afb541bd50;p=mirror%2Fdsa-puppet.git

Drop security-cdn.d.o on stretch

Now that security.d.o as a SRV record basically pointing to
security-cdn.d.o, there is no point to have both in the sources.list
for stretch hosts.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 4fcb87b48..703cafc42 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -25,12 +25,18 @@ class debian_org::apt {
 		site::aptrepo { 'security':
 			ensure => absent,
 		}
-	} else {
+	} elsif versioncmp($::lsbmajdistrelease, '8') <= 0 {
 		site::aptrepo { 'security':
 			url        => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
 			suite      => "${::lsbdistcodename}/updates",
 			components => ['main','contrib','non-free']
 		}
+	} else {
+		site::aptrepo { 'security':
+			url        => [ 'http://security.debian.org/' ],
+			suite      => "${::lsbdistcodename}/updates",
+			components => ['main','contrib','non-free']
+		}
 	}
 
 	$dbdosuites = [ 'debian-all', $::lsbdistcodename ]