X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=30f0be56508fb918a9ce70767c73052736fc521d;hb=9f34d53b1c47698c9ccb273908aa818feb86f83b;hp=af8f8bbf68decbda88d3299046393556335ea7df;hpb=387aca4f3d4660c2811cc11cc2ab5b709d6c5154;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index af8f8bbf6..30f0be565 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -20,6 +20,7 @@ class debian_org {
 	}
 
 	$samhain_recipients = hiera('samhain_recipients')
+	$root_mail_alias = hiera('root_mail_alias')
 
 	package { [
 			'klogd',
@@ -222,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
@@ -247,6 +256,11 @@ class debian_org {
 		recipient => $samhain_recipients,
 		require   => Package['debian.org']
 	}
+	mailalias { 'root':
+		ensure    => present,
+		recipient => $root_mail_alias,
+		require   => Package['debian.org']
+	}
 
 	file { '/usr/local/bin/check_for_updates':
 		source => 'puppet:///modules/debian_org/check_for_updates',