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 4fcb87b..703cafc 100644 (file)
--- 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 ]