X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=30f0be56508fb918a9ce70767c73052736fc521d;hb=37e9f0004961e8d3eb005cb4ec8e1074b7e05498;hp=3861d71833e2ef40029c9572ba0388b08db01aab;hpb=1c3ee9aeff0a4f334803eaf9e2a8a03c78710ac9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 3861d7183..30f0be565 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -19,13 +19,8 @@ class debian_org {
 		package { 'virt-what': ensure => purged }
 	}
 
-	$debianadmin = [
-		'debian-archive-debian-samhain-reports@master.debian.org',
-		'debian-admin@ftbfs.de',
-		'weasel@debian.org',
-		'steve@lobefin.net',
-		'zumbi@oron.es'
-	]
+	$samhain_recipients = hiera('samhain_recipients')
+	$root_mail_alias = hiera('root_mail_alias')
 
 	package { [
 			'klogd',
@@ -39,7 +34,9 @@ class debian_org {
 	}
 	package { [
 			'debian.org',
+			'debian.org-recommended',
 			'dsa-munin-plugins',
+			'userdir-ldap',
 		]:
 		ensure => installed,
 		tag    => extra_repo,
@@ -226,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
@@ -248,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']
 	}