X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=265734269ff3a9d2d6cb17821bc0de7315c5f420;hb=557b86e1834d9aa8477a2b0eda84f93e21e54921;hp=cb86848a94217b32b8019a525191abf831eae931;hpb=2b7b96aa83554bb8e40c668d115ea7cae9994773;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index cb86848a9..265734269 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -8,7 +8,7 @@ class debian-org {
 	} else {
 		$mirror = 'http://http.debian.net/debian/'
 	}
-	if $::lsbmajdistrelease < 7 {
+	if $::lsbmajdistrelease != "testing/unstable" and $::lsbmajdistrelease < 7 {
 		$mirror_backports = 'http://backports.debian.org/debian-backports/'
 	} else {
 		$mirror_backports = $mirror
@@ -27,6 +27,8 @@ class debian-org {
 			'klogd',
 			'sysklogd',
 			'rsyslog',
+			'os-prober',
+			'apt-listchanges',
 		]:
 		ensure => purged,
 	}
@@ -37,6 +39,12 @@ class debian-org {
 		ensure => installed,
 		tag    => extra_repo,
 	}
+	file { '/etc/ssh/ssh_known_hosts':
+		ensure  => present,
+		replace => false,
+		mode    => '0644',
+		source  => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
+	}
 
 	package { [
 			'apt-utils',
@@ -52,7 +60,7 @@ class debian-org {
 		ensure => installed,
 	}
 
-	if $::lsbmajdistrelease >= 7 {
+	if $::lsbmajdistrelease == "testing/unstable" or $::lsbmajdistrelease >= 7 {
 		package { 'libfilesystem-ruby1.9.1':
 			ensure => installed,
 		}
@@ -114,7 +122,7 @@ class debian-org {
 		suite      => "${::lsbdistcodename}/updates",
 		components => ['main','contrib','non-free']
 	}
-	if $::lsbmajdistrelease < 7 {
+	if $::lsbmajdistrelease != "testing/unstable" and $::lsbmajdistrelease < 7 {
 		site::aptrepo { 'debian-lts':
 			url        => $mirror,
 			suite      => "${::lsbdistcodename}-lts",
@@ -138,13 +146,18 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson] {
+	#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
+	#   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
+	#	site::aptrepo { 'proposed-updates':
+	#		url        => $mirror,
+	#		suite      => "${::lsbdistcodename}-proposed-updates",
+	#		components => ['main','contrib','non-free']
+	#	}
+	#} else {
 		site::aptrepo { 'proposed-updates':
-			url        => $mirror,
-			suite      => "${::lsbdistcodename}-proposed-updates",
-			components => ['main','contrib','non-free']
+			ensure => absent,
 		}
-	}
+	#}
 
 	site::aptrepo { 'debian.org':
 		ensure => absent,
@@ -152,10 +165,15 @@ class debian-org {
 
 	site::aptrepo { 'db.debian.org':
 		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'lenny',
+		suite      => 'debian-all',
 		components => 'main',
 		key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
 	}
+	site::aptrepo { 'db.debian.org-suite':
+		url        => 'http://db.debian.org/debian-admin',
+		suite      => $::lsbdistcodename,
+		components => 'main',
+	}
 
 	augeas { 'inittab_replicate':
 		context => '/files/etc/inittab',