X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=d49feca8cb3d8e19ea909f773ae4c7163d068e28;hb=552aed40f6b02e57e9bc6f560e84f767c535d3b4;hp=55cb506c1a784d1fe1686ea3bf03a38629a4e252;hpb=480520236bd9a2a7e0f27b34e2f91534fb917c7e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 55cb506c1..d49feca8c 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -34,8 +34,7 @@ class debian-org {
 		'debian-admin@ftbfs.de',
 		'weasel@debian.org',
 		'steve@lobefin.net',
-		'paravoid@debian.org',
-		'zumbi@kos.to'
+		'zumbi@oron.es'
 	]
 
 	package { [
@@ -131,10 +130,16 @@ class debian-org {
 		content => "",
 	}
 
-	site::aptrepo { 'security':
-		url        => 'http://security-cdn.debian.org/',
-		suite      => "${mungedcodename}/updates",
-		components => ['main','contrib','non-free']
+	if ($::lsbmajdistrelease >= 8) {
+		site::aptrepo { 'security':
+			url        => 'http://security-cdn.debian.org/',
+			suite      => "${mungedcodename}/updates",
+			components => ['main','contrib','non-free']
+		}
+	} else {
+		site::aptrepo { 'security':
+			ensure => absent,
+		}
 	}
 	site::aptrepo { 'debian-lts':
 		ensure => absent,
@@ -197,6 +202,15 @@ class debian-org {
 			components => ['main','contrib','non-free']
 		}
 	}
+	site::aptrepo { 'debian-cdn':
+		ensure => absent,
+	}
+
+	site::aptrepo { 'debian2':
+		url        => "http://cdn-fastly.deb.debian.org/debian",
+		suite      => $mungedcodename,
+		components => ['main','contrib','non-free']
+	}
 
 	file { '/etc/facter':
 		ensure  => directory,
@@ -223,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'],
@@ -297,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':