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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index fcef2e89..aa90ad03 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,8 +1,12 @@
+# == 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/'
+		$mirror = 'http://ftp.debian.org/debian/'
 	}
 	if $::lsbmajdistrelease < 7 {
 		$mirror_backports = 'http://backports.debian.org/debian-backports/'
@@ -10,18 +14,36 @@ class debian-org {
 		$mirror_backports = $mirror
 	}
 
+	if $::lsbmajdistrelease <= 7 {
+		$mungedcodename = $::lsbdistcodename
+	} elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+		$mungedcodename = "${::lsbdistcodename}-kfreebsd"
+	} else {
+		$mungedcodename = $::lsbdistcodename
+	}
+
+	if $systemd {
+		include systemd
+		$servicefiles = 'present'
+	} else {
+		$servicefiles = 'absent'
+	}
+
 	$debianadmin = [
 		'debian-archive-debian-samhain-reports@master.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,14 +54,27 @@ 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'
+	}
 
+	if ($::lsbmajdistrelease >= 8) {
+		$rubyfs_package = 'ruby-filesystem'
+	} elsif $::lsbmajdistrelease == 7  {
+		$rubyfs_package = 'libfilesystem-ruby1.9'
+	} else {
+		$rubyfs_package = 'libfilesystem-ruby1.8'
+	}
 	package { [
 			'apt-utils',
 			'bash-completion',
 			'dnsutils',
 			'less',
 			'lsb-release',
-			'libfilesystem-ruby1.8',
+			$rubyfs_package,
 			'mtr-tiny',
 			'nload',
 			'pciutils',
@@ -47,12 +82,6 @@ class debian-org {
 		ensure => installed,
 	}
 
-	if $::lsbmajdistrelease >= 7 {
-		package { 'libfilesystem-ruby1.9.1':
-			ensure => installed,
-		}
-	}
-
 	munin::check { [
 			'cpu',
 			'entropy',
@@ -94,22 +123,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",
+		suite      => "${mungedcodename}/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,
@@ -117,21 +162,49 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
+	#if ($::hostname in [corelli, eysler, lucatelli, 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') {
 		site::aptrepo { 'debian':
 			url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
-			suite      => $::lsbdistcodename,
+			suite      => $mungedcodename,
 			components => ['main','contrib','non-free']
 		}
 	}
@@ -152,10 +225,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',
 	}
@@ -179,13 +248,39 @@ class debian-org {
 	file { '/etc/default/puppet':
 		source => 'puppet:///modules/debian-org/puppet.default',
 	}
+	file { '/etc/systemd':
+		ensure  => directory,
+		mode => 0755,
+	}
+	file { '/etc/systemd/system':
+		ensure  => directory,
+		mode => 0755,
+	}
+	file { '/etc/systemd/system/ud-replicated.service':
+		ensure => $servicefiles,
+		source => 'puppet:///modules/debian-org/ud-replicated.service',
+		notify => Exec['systemctl daemon-reload'],
+	}
+	if $systemd {
+		file { '/etc/systemd/system/multi-user.target.wants/ud-replicated.service':
+			ensure => 'link',
+			target => '../ud-replicated.service',
+			notify => Exec['systemctl daemon-reload'],
+		}
+	}
+	file { '/etc/systemd/system/puppet.service':
+		ensure => 'link',
+		target => '/dev/null',
+		notify => Exec['systemctl daemon-reload'],
+	}
+
 	file { '/etc/cron.d/dsa-puppet-stuff':
-		source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
+		content => template('debian-org/dsa-puppet-stuff.cron.erb'),
 		require => Package['debian.org'],
 	}
 	file { '/etc/ldap/ldap.conf':
 		require => Package['debian.org'],
-		source => 'puppet:///modules/debian-org/ldap.conf',
+		content  => template('debian-org/ldap.conf.erb'),
 	}
 	file { '/etc/pam.d/common-session':
 		require => Package['debian.org'],
@@ -197,8 +292,8 @@ class debian-org {
 	}
 	file { '/etc/rc.local':
 		mode   => '0755',
-		source => 'puppet:///modules/debian-org/rc.local',
-		notify => Exec['rc.local start'],
+		content => template('debian-org/rc.local.erb'),
+		notify => Exec['service rc.local start'],
 	}
 	file { '/etc/dsa':
 		ensure => directory,
@@ -216,8 +311,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 +324,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 |>
 
@@ -241,15 +347,44 @@ class debian-org {
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 		refreshonly => true
 	}
-	exec { 'puppetmaster restart':
-		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+	exec { 'service puppetmaster restart':
 		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
 	}
+
+	exec { 'systemctl daemon-reload':
+		refreshonly => true,
+		onlyif  => "test -x /bin/systemctl"
+	}
+
+	exec { 'systemd-tmpfiles --create --exclude-prefix=/dev':
+		refreshonly => true,
+		onlyif  => "test -x /bin/systemd-tmpfiles"
+	}
+
+	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',
+	}
 }