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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index adaacc390..d49feca8c 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -7,12 +7,11 @@ class debian-org {
 		$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
 	} else {
 		#$mirror = 'http://ftp.debian.org/debian/'
-		$mirror = 'http://deb.debian.org/debian/'
-	}
-	if $::lsbmajdistrelease < 7 {
-		$mirror_backports = 'http://backports.debian.org/debian-backports/'
-	} else {
-		$mirror_backports = $mirror
+		if $::lsbmajdistrelease <= 8 {
+			$mirror = 'http://cdn-fastly.deb.debian.org/debian/'
+		} else {
+			$mirror = 'http://deb.debian.org/debian/'
+		}
 	}
 
 	if $::lsbmajdistrelease <= 7 {
@@ -35,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 { [
@@ -64,10 +62,8 @@ class debian-org {
 
 	if ($::lsbmajdistrelease >= 8) {
 		$rubyfs_package = 'ruby-filesystem'
-	} elsif $::lsbmajdistrelease == 7  {
-		$rubyfs_package = 'libfilesystem-ruby1.9'
 	} else {
-		$rubyfs_package = 'libfilesystem-ruby1.8'
+		$rubyfs_package = 'libfilesystem-ruby1.9'
 	}
 	package { [
 			'apt-utils',
@@ -134,25 +130,23 @@ class debian-org {
 		content => "",
 	}
 
-	site::aptrepo { 'security':
-		url        => 'http://security-cdn.debian.org/',
-		suite      => "${mungedcodename}/updates",
-		components => ['main','contrib','non-free']
-	}
-	if $::lsbmajdistrelease < 7 {
-		site::aptrepo { 'debian-lts':
-			url        => $mirror,
-			suite      => "${::lsbdistcodename}-lts",
+	if ($::lsbmajdistrelease >= 8) {
+		site::aptrepo { 'security':
+			url        => 'http://security-cdn.debian.org/',
+			suite      => "${mungedcodename}/updates",
 			components => ['main','contrib','non-free']
 		}
 	} else {
-		site::aptrepo { 'debian-lts':
+		site::aptrepo { 'security':
 			ensure => absent,
 		}
 	}
+	site::aptrepo { 'debian-lts':
+		ensure => absent,
+	}
 
 	site::aptrepo { 'backports.debian.org':
-		url        => $mirror_backports,
+		url        => $mirror,
 		suite      => "${::lsbdistcodename}-backports",
 		components => ['main','contrib','non-free']
 	}
@@ -163,10 +157,10 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if ($::hostname in []) {
+	if ($::hostname in [] or $::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
 		site::aptrepo { 'proposed-updates':
 			url        => $mirror,
-			suite      => "${::lsbdistcodename}-proposed-updates",
+			suite      => "${mungedcodename}-proposed-updates",
 			components => ['main','contrib','non-free']
 		}
 	} else {
@@ -208,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,
@@ -234,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'],
@@ -308,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':