X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=30f0be56508fb918a9ce70767c73052736fc521d;hb=673a5b185244cbbbe329eba2d6d1193029877d29;hp=6cb629efc073bec1b6ab32e64e83c023fefac997;hpb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 6cb629efc..30f0be565 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -12,13 +12,15 @@ class debian_org {
 		$servicefiles = 'absent'
 	}
 
-	$debianadmin = [
-		'debian-archive-debian-samhain-reports@master.debian.org',
-		'debian-admin@ftbfs.de',
-		'weasel@debian.org',
-		'steve@lobefin.net',
-		'zumbi@oron.es'
-	]
+	# the virtual facter needs virt-what on jessie to work
+	if versioncmp($::lsbmajdistrelease, '9') < 0 {
+		package { 'virt-what': ensure => installed }
+	} else {
+		package { 'virt-what': ensure => purged }
+	}
+
+	$samhain_recipients = hiera('samhain_recipients')
+	$root_mail_alias = hiera('root_mail_alias')
 
 	package { [
 			'klogd',
@@ -26,12 +28,15 @@ class debian_org {
 			'rsyslog',
 			'os-prober',
 			'apt-listchanges',
+			'mlocate',
 		]:
 		ensure => purged,
 	}
 	package { [
 			'debian.org',
+			'debian.org-recommended',
 			'dsa-munin-plugins',
+			'userdir-ldap',
 		]:
 		ensure => installed,
 		tag    => extra_repo,
@@ -43,7 +48,7 @@ class debian_org {
 		source  => 'puppet:///modules/debian_org/basic-ssh_known_hosts'
 	}
 
-	if ($::lsbmajdistrelease >= '8') {
+	if versioncmp($::lsbmajdistrelease, '8') >= 0 {
 		$rubyfs_package = 'ruby-filesystem'
 	} else {
 		$rubyfs_package = 'libfilesystem-ruby1.9'
@@ -136,7 +141,7 @@ class debian_org {
 	}
 	file { '/etc/puppet/puppet.conf':
 		content => template('debian_org/puppet.conf.erb'),
-		mode => 0440,
+		mode => '0440',
 		group => 'puppet',
 	}
 	file { '/etc/default/puppet':
@@ -144,11 +149,11 @@ class debian_org {
 	}
 	file { '/etc/systemd':
 		ensure  => directory,
-		mode => 0755,
+		mode => '0755',
 	}
 	file { '/etc/systemd/system':
 		ensure  => directory,
-		mode => 0755,
+		mode => '0755',
 	}
 	file { '/etc/systemd/system/ud-replicated.service':
 		ensure => $servicefiles,
@@ -218,6 +223,14 @@ class debian_org {
 		mode   => '0444',
 		source => 'puppet:///modules/debian_org/etc.zsh/zprofile',
 	}
+	file { '/etc/environment':
+		content => "",
+		mode => '0440',
+	}
+	file { '/etc/default/locale':
+		content => "",
+		mode => '0440',
+	}
 
 	# set mmap_min_addr to 4096 to mitigate
 	# Linux NULL-pointer dereference exploits
@@ -240,7 +253,12 @@ class debian_org {
 	}
 	mailalias { 'samhain-reports':
 		ensure    => present,
-		recipient => $debianadmin,
+		recipient => $samhain_recipients,
+		require   => Package['debian.org']
+	}
+	mailalias { 'root':
+		ensure    => present,
+		recipient => $root_mail_alias,
 		require   => Package['debian.org']
 	}
 
@@ -250,6 +268,10 @@ class debian_org {
 		owner  => root,
 		group  => root,
 	}
+	file { '/usr/local/bin/dsa-is-shutdown-scheduled':
+		source	=> 'puppet:///modules/debian_org/dsa-is-shutdown-scheduled',
+		mode	=> '0555',
+	}
 
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
@@ -301,4 +323,10 @@ class debian_org {
 	file { '/root/.vimrc':
 		source => 'puppet:///modules/debian_org/root-dotfiles/vimrc',
 	}
+
+	if versioncmp($::lsbmajdistrelease, '9') >= 0 { # older puppets do facts as strings.
+		if $::processorcount > 1 {
+			package { 'irqbalance': ensure => installed }
+		}
+	}
 }