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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 8264a309d..a64fb5419 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,3 +1,7 @@
+# == Class: debian-org
+#
+# Stuff common to all debian.org servers
+#
 class debian-org {
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
 		$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
@@ -23,6 +27,7 @@ class debian-org {
 			'klogd',
 			'sysklogd',
 			'rsyslog',
+			'os-prober',
 		]:
 		ensure => purged,
 	}
@@ -33,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',
@@ -95,22 +106,38 @@ class debian-org {
 		require => Package['molly-guard'],
 	}
 
+	file { '/etc/apt/trusted-keys.d':
+		ensure => absent,
+		force  => true,
+	}
+
+	file { '/etc/apt/trusted.gpg':
+		mode    => '0600',
+		content => "",
+	}
+
 	site::aptrepo { 'security':
 		url        => 'http://security.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,
 		suite      => "${::lsbdistcodename}-backports",
 		components => ['main','contrib','non-free']
 	}
-	site::aptrepo { 'backports.org':
-		ensure => absent,
-		keyid  => '16BA136C',
-		key    => 'puppet:///modules/debian-org/backports.org.asc',
-	}
 
 	site::aptrepo { 'volatile':
 		url        => $mirror,
@@ -118,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,
@@ -132,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.asc',
 	}
 
 	augeas { 'inittab_replicate':
@@ -142,9 +179,9 @@ class debian-org {
 		changes => [
 			'set ud/runlevels 2345',
 			'set ud/action respawn',
-			"set mo/process /usr/bin/ud-replicated",
+			'set ud/process "/usr/bin/ud-replicated -d"',
 		],
-		notify => Exec['init q'],
+		notify  => Exec['init q'],
 	}
 
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
@@ -171,10 +208,6 @@ class debian-org {
 	file { '/etc/apt/preferences':
 		source => 'puppet:///modules/debian-org/apt.preferences',
 	}
-	file { '/etc/apt/trusted-keys.d/':
-		ensure => directory,
-		purge  => true,
-	}
 	file { '/etc/apt/apt.conf.d/local-compression':
 		source => 'puppet:///modules/debian-org/apt.conf.d/local-compression',
 	}
@@ -290,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',
+	}
 }