X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=2341b8586df61d54619f4c34ca6afa5d6109eca4;hb=7b0e939e7e0aad21855010191684b8f322244826;hp=053b61ac380285cf44c17139a55610c3e345c783;hpb=e653a754fc01e5496ed31e92ad3d1691264681ed;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 053b61ac3..2341b8586 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',
@@ -114,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,
@@ -127,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,
@@ -295,4 +318,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',
+	}
 }