X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;h=32a1fa82d6657b7e14614224a3c94f7d2d329db4;hb=fec4861e676415e8952b36c308ed40f7ce060fc4;hp=90ac4fb52f770227b0176cc5d1606ed3e2b2e7ba;hpb=0808e7cdefd89761bee793e373d391ea076ff3de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 90ac4fb52..32a1fa82d 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -10,9 +10,9 @@ class debian_org::apt {
 	}
 
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-		$mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror, 'http://debian.anycast-test.mirrors.debian.org/debian/' ]
+		$mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror ]
 	} else {
-		$mirror = [ $fallbackmirror, 'http://debian.anycast-test.mirrors.debian.org/debian/' ]
+		$mirror = [ $fallbackmirror ]
 	}
 
 	site::aptrepo { 'debian':
@@ -21,13 +21,15 @@ class debian_org::apt {
 		components => ['main','contrib','non-free']
 	}
 
-	if ($::hostname in [smetana]) {
+	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
 		site::aptrepo { 'security':
-			ensure => absent,
+			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-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security.debian.org/' ],
+			url        => [ 'http://security.debian.org/' ],
 			suite      => "${::lsbdistcodename}/updates",
 			components => ['main','contrib','non-free']
 		}