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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 1c42d5f59..2afdd4f7b 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,11 +1,22 @@
 class debian-org {
+	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
+		$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
+	} else {
+		$mirror = 'http://http.debian.net/debian/'
+	}
+	if $::lsbmajdistrelease < 7 {
+		$mirror_backports = 'http://backports.debian.org/debian-backports/'
+	} else {
+		$mirror_backports = $mirror
+	}
 
 	$debianadmin = [
 		'debian-archive-debian-samhain-reports@master.debian.org',
 		'debian-admin@ftbfs.de',
 		'weasel@debian.org',
 		'steve@lobefin.net',
-		'paravoid@debian.org'
+		'paravoid@debian.org',
+		'zumbi@kos.to'
 	]
 
 	package { [
@@ -38,7 +49,7 @@ class debian-org {
 	}
 
 	if $::lsbmajdistrelease >= 7 {
-		package { 'libfilesystem-ruby1.9':
+		package { 'libfilesystem-ruby1.9.1':
 			ensure => installed,
 		}
 	}
@@ -90,26 +101,10 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if $::lsbdistcodename != 'wheezy' {
-		site::aptrepo { 'backports.debian.org':
-			url        => 'http://backports.debian.org/debian-backports/',
-			suite      => "${::lsbdistcodename}-backports",
-			components => ['main','contrib','non-free']
-		}
-
-		if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-			site::aptrepo { 'volatile':
-				url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
-				suite      => "${::lsbdistcodename}-updates",
-				components => ['main','contrib','non-free']
-			}
-		} else {
-			site::aptrepo { 'volatile':
-				url        => 'http://ftp.debian.org/debian',
-				suite      => "${::lsbdistcodename}-updates",
-				components => ['main','contrib','non-free']
-			}
-		}
+	site::aptrepo { 'backports.debian.org':
+		url        => $mirror_backports,
+		suite      => "${::lsbdistcodename}-backports",
+		components => ['main','contrib','non-free']
 	}
 	site::aptrepo { 'backports.org':
 		ensure => absent,
@@ -117,6 +112,20 @@ class debian-org {
 		key => 'puppet:///modules/debian-org/backports.org.asc',
 	}
 
+	site::aptrepo { 'volatile':
+		url        => $mirror,
+		suite      => "${::lsbdistcodename}-updates",
+		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',