X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=ad53e5c5aed49525f3dfd64d903ea5f7caabdfe2;hb=65139996ecd9fed4bb7498e6ac9e73fdaa6920ac;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..ad53e5c5a 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
@@ -40,7 +35,7 @@ class debian-org {
 		'weasel@debian.org',
 		'steve@lobefin.net',
 		'paravoid@debian.org',
-		'zumbi@kos.to'
+		'zumbi@oron.es'
 	]
 
 	package { [
@@ -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',
@@ -138,25 +131,23 @@ class debian-org {
 		content => "",
 	}
 
-	site::aptrepo { 'security':
-		url        => 'http://security-cdn.debian.org/',
-		suite      => "${mungedcodename}/updates",
-		components => ['main','contrib','non-free']
-	}
-	if $::lsbmajdistrelease < 7 {
-		site::aptrepo { 'debian-lts':
-			url        => $mirror,
-			suite      => "${::lsbdistcodename}-lts",
+	if ($::lsbmajdistrelease >= 8) {
+		site::aptrepo { 'security':
+			url        => 'http://security-cdn.debian.org/',
+			suite      => "${mungedcodename}/updates",
 			components => ['main','contrib','non-free']
 		}
 	} else {
-		site::aptrepo { 'debian-lts':
+		site::aptrepo { 'security':
 			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 +158,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 +203,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,