X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=d49feca8cb3d8e19ea909f773ae4c7163d068e28;hb=382631d89f998e0cacd42a44464225780c8f8a0e;hp=ad53e5c5aed49525f3dfd64d903ea5f7caabdfe2;hpb=ee1a03034dd63caac0060827b88d19bf4d42a2c0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ad53e5c5a..d49feca8c 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -34,7 +34,6 @@ class debian-org {
 		'debian-admin@ftbfs.de',
 		'weasel@debian.org',
 		'steve@lobefin.net',
-		'paravoid@debian.org',
 		'zumbi@oron.es'
 	]
 
@@ -238,6 +237,9 @@ class debian-org {
 	file { '/etc/apt/apt.conf.d/local-pdiffs':
 		source => 'puppet:///modules/debian-org/apt.conf.d/local-pdiffs',
 	}
+	file { '/etc/apt/apt.conf.d/local-langs':
+		source => 'puppet:///modules/debian-org/apt.conf.d/local-langs',
+	}
 	file { '/etc/timezone':
 		source => 'puppet:///modules/debian-org/timezone',
 		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
@@ -312,6 +314,18 @@ class debian-org {
 		source => 'puppet:///modules/debian-org/nsswitch.conf',
 	}
 
+	file { '/etc/profile.d/timeout.sh':
+		mode   => '0555',
+		source => 'puppet:///modules/debian-org/etc.profile.d/timeout.sh',
+	}
+	file { '/etc/zsh':
+		ensure => directory,
+	}
+	file { '/etc/zsh/zprofile':
+		mode   => '0444',
+		source => 'puppet:///modules/debian-org/etc.zsh/zprofile',
+	}
+
 	# set mmap_min_addr to 4096 to mitigate
 	# Linux NULL-pointer dereference exploits
 	site::sysctl { 'mmap_min_addr':