X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=bcfff1c6f87a90f90ca54ebd982c080f02e2d1b1;hb=19d43181e2f0be68fa850a15984b4eb8481e0650;hp=ad592d77771b6887e2ad9c6faf8baaf31f67eb9a;hpb=464c4699d7cc18c39018bffbd32687fe312251a2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ad592d777..bcfff1c6f 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 { [
@@ -20,11 +31,9 @@ class debian-org {
 			'dsa-munin-plugins',
 		]:
 		ensure => installed,
-		require => [
-			File['/etc/apt/sources.list.d/db.debian.org.list'],
-			Exec['apt-get update']
-		]
+		tag    => extra_repo,
 	}
+
 	package { [
 			'apt-utils',
 			'bash-completion',
@@ -40,7 +49,7 @@ class debian-org {
 	}
 
 	if $::lsbmajdistrelease >= 7 {
-		package { 'libfilesystem-ruby1.9':
+		package { 'libfilesystem-ruby1.9.1':
 			ensure => installed,
 		}
 	}
@@ -68,10 +77,7 @@ class debian-org {
 	if getfromhash($site::nodeinfo, 'broken-rtc') {
 		package { 'fake-hwclock':
 			ensure => installed,
-			require => [
-				File['/etc/apt/sources.list.d/db.debian.org.list'],
-				Exec['apt-get update']
-			]
+			tag    => extra_repo,
 		}
 	}
 
@@ -95,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,
@@ -122,6 +112,12 @@ class debian-org {
 		key => 'puppet:///modules/debian-org/backports.org.asc',
 	}
 
+	site::aptrepo { 'volatile':
+		url        => $mirror,
+		suite      => "${::lsbdistcodename}-updates",
+		components => ['main','contrib','non-free']
+	}
+
 	site::aptrepo { 'debian.org':
 		ensure => absent,
 	}
@@ -213,12 +209,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',
@@ -236,6 +239,7 @@ class debian-org {
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 		refreshonly => true,
 	}
+	Exec['apt-get update']->Package<| tag == extra_repo |>
 
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',