X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=6ac4c123a22c2a82b117b0cf0889496df27228a5;hb=67db5724b6dd3c1e629dfe0be5db20821ffcc0f7;hp=10c8c4a5a58f6113ca159cd1768aa847306c6c98;hpb=84c227de04e238adea4e350fc53f8f4a947f5988;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 10c8c4a5a..6ac4c123a 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/'
@@ -162,10 +167,10 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if ($::hostname in [mips-aql-05, mipsel-aql-01, mipsel-aql-02, mipsel-manda-02, eberlin, etler]) {
+	if ($::hostname in [] or $::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
 		site::aptrepo { 'proposed-updates':
 			url        => $mirror,
-			suite      => "${::lsbdistcodename}-proposed-updates",
+			suite      => "${mungedcodename}-proposed-updates",
 			components => ['main','contrib','non-free']
 		}
 	} else {