X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=2afdd4f7b5220087f5175ae67ab593416687f99f;hb=42b6a399089afa8becb49d8fe573e61502c80f36;hp=fcef2e89a3c508c29a0c297d2f0e1b114c76dca7;hpb=1a2b96081cd2d9f1492630b1ebb60331e7db5a06;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index fcef2e89a..2afdd4f7b 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -15,7 +15,8 @@ class debian-org {
 		'debian-admin@ftbfs.de',
 		'weasel@debian.org',
 		'steve@lobefin.net',
-		'paravoid@debian.org'
+		'paravoid@debian.org',
+		'zumbi@kos.to'
 	]
 
 	package { [
@@ -117,6 +118,14 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
+	if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+		site::aptrepo { 'proposed-updates':
+			url        => $mirror,
+			suite      => "${::lsbdistcodename}-proposed-updates",
+			components => ['main','contrib','non-free']
+		}
+	}
+
 	site::aptrepo { 'debian.org':
 		ensure => absent,
 	}
@@ -216,8 +225,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',