X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=168b03f7cf23abaa8f79cdfa0f0731eaedb53701;hb=13a293a08b9b889bd39f8ae5b632ebea61136cd8;hp=2525e30fc606df25bc72b1eca1a252e55698da0b;hpb=8e2327eb70f1d7afce481638cd797c7d4b607cef;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 2525e30fc..168b03f7c 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -6,7 +6,12 @@ class debian-org {
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
 		$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
 	} else {
-		$mirror = 'http://ftp.debian.org/debian/'
+		#$mirror = 'http://ftp.debian.org/debian/'
+		if $::lsbmajdistrelease <= 8 {
+			$mirror = 'http://cdn-fastly.deb.debian.org/debian/'
+		} else {
+			$mirror = 'http://deb.debian.org/debian/'
+		}
 	}
 	if $::lsbmajdistrelease < 7 {
 		$mirror_backports = 'http://backports.debian.org/debian-backports/'
@@ -134,7 +139,7 @@ class debian-org {
 	}
 
 	site::aptrepo { 'security':
-		url        => 'http://security.debian.org/',
+		url        => 'http://security-cdn.debian.org/',
 		suite      => "${mungedcodename}/updates",
 		components => ['main','contrib','non-free']
 	}
@@ -162,7 +167,7 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if ($::hostname in [mips-aql-05, mipsel-aql-02]) {
+	if ($::hostname in []) {
 		site::aptrepo { 'proposed-updates':
 			url        => $mirror,
 			suite      => "${::lsbdistcodename}-proposed-updates",