X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=a64fb541987ce008b0df402a4658c475f9bf064a;hb=677f1c3d83ca68762a16d237e01715cc8434d6c7;hp=840efc1f9e9f2378b50fb1ca87ef906f628f0d2f;hpb=319a20e7ac6487c37735e1a43c8e5a0f2409e857;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 840efc1f9..a64fb5419 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -27,6 +27,7 @@ class debian-org {
 			'klogd',
 			'sysklogd',
 			'rsyslog',
+			'os-prober',
 		]:
 		ensure => purged,
 	}
@@ -37,6 +38,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',
@@ -101,6 +108,7 @@ class debian-org {
 
 	file { '/etc/apt/trusted-keys.d':
 		ensure => absent,
+		force  => true,
 	}
 
 	file { '/etc/apt/trusted.gpg':
@@ -113,6 +121,17 @@ class debian-org {
 		suite      => "${::lsbdistcodename}/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 { 'backports.debian.org':
 		url        => $mirror_backports,
@@ -126,13 +145,18 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+	#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, 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,
@@ -140,9 +164,14 @@ 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',
-		key        => 'puppet:///modules/debian-org/db.debian.org.db',
 	}
 
 	augeas { 'inittab_replicate':
@@ -294,4 +323,17 @@ class debian-org {
 		matches  => [ 'paths', 'contents' ],
 		schedule => weekly
 	}
+
+	file { '/root/.bashrc':
+		source => 'puppet:///modules/debian-org/root-dotfiles/bashrc',
+	}
+	file { '/root/.profile':
+		source => 'puppet:///modules/debian-org/root-dotfiles/profile',
+	}
+	file { '/root/.screenrc':
+		source => 'puppet:///modules/debian-org/root-dotfiles/screenrc',
+	}
+	file { '/root/.vimrc':
+		source => 'puppet:///modules/debian-org/root-dotfiles/vimrc',
+	}
 }