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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 168b03f7c..2ea9e150a 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -13,11 +13,6 @@ class debian-org {
 			$mirror = 'http://deb.debian.org/debian/'
 		}
 	}
-	if $::lsbmajdistrelease < 7 {
-		$mirror_backports = 'http://backports.debian.org/debian-backports/'
-	} else {
-		$mirror_backports = $mirror
-	}
 
 	if $::lsbmajdistrelease <= 7 {
 		$mungedcodename = $::lsbdistcodename
@@ -68,10 +63,8 @@ class debian-org {
 
 	if ($::lsbmajdistrelease >= 8) {
 		$rubyfs_package = 'ruby-filesystem'
-	} elsif $::lsbmajdistrelease == 7  {
-		$rubyfs_package = 'libfilesystem-ruby1.9'
 	} else {
-		$rubyfs_package = 'libfilesystem-ruby1.8'
+		$rubyfs_package = 'libfilesystem-ruby1.9'
 	}
 	package { [
 			'apt-utils',
@@ -143,20 +136,12 @@ class debian-org {
 		suite      => "${mungedcodename}/updates",
 		components => ['main','contrib','non-free']
 	}
-	if $::lsbmajdistrelease < 7 {
-		site::aptrepo { 'debian-lts':
-			url        => $mirror,
-			suite      => "${::lsbdistcodename}-lts",
-			components => ['main','contrib','non-free']
-		}
-	} else {
-		site::aptrepo { 'debian-lts':
-			ensure => absent,
-		}
+	site::aptrepo { 'debian-lts':
+		ensure => absent,
 	}
 
 	site::aptrepo { 'backports.debian.org':
-		url        => $mirror_backports,
+		url        => $mirror,
 		suite      => "${::lsbdistcodename}-backports",
 		components => ['main','contrib','non-free']
 	}
@@ -167,10 +152,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 {
@@ -212,6 +197,15 @@ class debian-org {
 			components => ['main','contrib','non-free']
 		}
 	}
+	site::aptrepo { 'debian-cdn':
+		ensure => absent,
+	}
+
+	site::aptrepo { 'debian2':
+		url        => "http://cdn-fastly.deb.debian.org/debian",
+		suite      => $mungedcodename,
+		components => ['main','contrib','non-free']
+	}
 
 	file { '/etc/facter':
 		ensure  => directory,