X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=9f3881047d05bebb21f0fd01ffe0728dd0079a6a;hb=ac38af297a68f63db37d866084dc1827a6c73f44;hp=fcef2e89a3c508c29a0c297d2f0e1b114c76dca7;hpb=9d52e9a8f5cfc4a88e368b3874a007f6abb44266;p=dsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index fcef2e89..9f388104 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,10 +1,14 @@
+# == 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')
 	} 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
@@ -15,13 +19,16 @@ class debian-org {
 		'debian-admin@ftbfs.de',
 		'weasel@debian.org',
 		'steve@lobefin.net',
-		'paravoid@debian.org'
+		'paravoid@debian.org',
+		'zumbi@kos.to'
 	]
 
 	package { [
 			'klogd',
 			'sysklogd',
 			'rsyslog',
+			'os-prober',
+			'apt-listchanges',
 		]:
 		ensure => purged,
 	}
@@ -32,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',
@@ -47,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,
 		}
@@ -94,22 +107,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 != "testing/unstable" and $::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,
@@ -117,15 +146,43 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
+	#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':
+			ensure => absent,
+		}
+	#}
+
 	site::aptrepo { 'debian.org':
 		ensure => absent,
 	}
 
 	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':
+		context => '/files/etc/inittab',
+		changes => [
+			'set ud/runlevels 2345',
+			'set ud/action respawn',
+			'set ud/process "/usr/bin/ud-replicated -d"',
+		],
+		notify  => Exec['init q'],
 	}
 
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
@@ -152,10 +209,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',
 	}
@@ -180,12 +233,12 @@ class debian-org {
 		source => 'puppet:///modules/debian-org/puppet.default',
 	}
 	file { '/etc/cron.d/dsa-puppet-stuff':
-		source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
+		source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
 		require => Package['debian.org'],
 	}
 	file { '/etc/ldap/ldap.conf':
 		require => Package['debian.org'],
-		source => 'puppet:///modules/debian-org/ldap.conf',
+		source  => 'puppet:///modules/debian-org/ldap.conf',
 	}
 	file { '/etc/pam.d/common-session':
 		require => Package['debian.org'],
@@ -198,7 +251,7 @@ class debian-org {
 	file { '/etc/rc.local':
 		mode   => '0755',
 		source => 'puppet:///modules/debian-org/rc.local',
-		notify => Exec['rc.local start'],
+		notify => Exec['service rc.local start'],
 	}
 	file { '/etc/dsa':
 		ensure => directory,
@@ -216,8 +269,11 @@ class debian-org {
 	# set mmap_min_addr to 4096 to mitigate
 	# Linux NULL-pointer dereference exploits
 	site::sysctl { 'mmap_min_addr':
-		key   => 'vm.mmap_min_addr',
-		value => '4096',
+		ensure => absent
+	}
+	site::sysctl { 'perf_event_paranoid':
+		key   => 'kernel.perf_event_paranoid',
+		value => '2',
 	}
 	site::alternative { 'editor':
 		linkto => '/usr/bin/vim.basic',
@@ -226,14 +282,22 @@ class debian-org {
 		linkto => '/usr/bin/vim.basic',
 	}
 	mailalias { 'samhain-reports':
-		ensure => present,
+		ensure    => present,
 		recipient => $debianadmin,
-		require => Package['debian.org']
+		require   => Package['debian.org']
+	}
+
+	file { '/usr/local/bin/check_for_updates':
+		source => 'puppet:///modules/debian-org/check_for_updates',
+		mode   => '0755',
+		owner  => root,
+		group  => root,
 	}
 
 	exec { 'apt-get update':
-		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-		refreshonly => true,
+		path    => '/usr/bin:/usr/sbin:/bin:/sbin',
+		onlyif  => '/usr/local/bin/check_for_updates',
+		require => File['/usr/local/bin/check_for_updates']
 	}
 	Exec['apt-get update']->Package<| tag == extra_repo |>
 
@@ -245,11 +309,31 @@ class debian-org {
 		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
 		refreshonly => true
 	}
-	exec { 'rc.local start':
-		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+	exec { 'service rc.local start':
 		refreshonly => true
 	}
 	exec { 'init q':
 		refreshonly => true
 	}
+
+	tidy { '/var/lib/puppet/clientbucket/':
+		age      => '2w',
+		recurse  => 9,
+		type     => ctime,
+		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',
+	}
 }