X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=6ac4c123a22c2a82b117b0cf0889496df27228a5;hb=ec4fd3195fd71edde7bd1e7a9624b4b4255f8da5;hp=478dc8301aaefc7e69a3dc90a9989e030a625e6c;hpb=824db06dc93b5cdbee2fc4e007679aa3a70d1f47;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 478dc8301..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 []) {
+	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 {