X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=2afdd4f7b5220087f5175ae67ab593416687f99f;hb=89877518c810748413379a016b58d146e4597b99;hp=9feb912f55739fe86812e8a7d0554cb8bb5e9b26;hpb=9c62ba724859de678c8311ef8e5f9ef975b173f4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 9feb912f5..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 { [
@@ -101,7 +102,7 @@ class debian-org {
 	}
 
 	site::aptrepo { 'backports.debian.org':
-		url        => $mirror_backports
+		url        => $mirror_backports,
 		suite      => "${::lsbdistcodename}-backports",
 		components => ['main','contrib','non-free']
 	}
@@ -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,
 	}
@@ -208,12 +217,19 @@ class debian-org {
 		source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron.ignore',
 		require => Package['debian.org']
 	}
+	file { '/etc/nsswitch.conf':
+		mode   => '0755',
+		source => 'puppet:///modules/debian-org/nsswitch.conf',
+	}
 
 	# 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',