X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=c7e0db02d649d16c2ee3e34ce7a17a188a99afd9;hb=0085b75ec2cb4327d3959932ed92de7a9804cd8a;hp=a192c7d98f3f102223227b869987db8c6b26e3c9;hpb=25b1da5bbb145ded97398f27b711539d41ba2689;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index a192c7d98..c7e0db02d 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -6,15 +6,24 @@ class debian-org {
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
 		$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
 	} else {
-		$mirror = 'http://ftp.debian.org/debian/'
+		#$mirror = 'http://ftp.debian.org/debian/'
+		if $::lsbmajdistrelease <= 8 {
+			$mirror = 'http://cdn-fastly.deb.debian.org/debian/'
+		} else {
+			$mirror = 'http://deb.debian.org/debian/'
+		}
 	}
-	if $::lsbmajdistrelease < 7 {
-		$mirror_backports = 'http://backports.debian.org/debian-backports/'
+
+	if $::lsbmajdistrelease <= 7 {
+		$mungedcodename = $::lsbdistcodename
+	} elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+		$mungedcodename = "${::lsbdistcodename}-kfreebsd"
 	} else {
-		$mirror_backports = $mirror
+		$mungedcodename = $::lsbdistcodename
 	}
 
 	if $systemd {
+		include systemd
 		$servicefiles = 'present'
 	} else {
 		$servicefiles = 'absent'
@@ -52,13 +61,18 @@ class debian-org {
 		source  => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
 	}
 
+	if ($::lsbmajdistrelease >= 8) {
+		$rubyfs_package = 'ruby-filesystem'
+	} else {
+		$rubyfs_package = 'libfilesystem-ruby1.9'
+	}
 	package { [
 			'apt-utils',
 			'bash-completion',
 			'dnsutils',
 			'less',
 			'lsb-release',
-			'libfilesystem-ruby1.8',
+			$rubyfs_package,
 			'mtr-tiny',
 			'nload',
 			'pciutils',
@@ -66,16 +80,6 @@ class debian-org {
 		ensure => installed,
 	}
 
-	if $::lsbmajdistrelease == 7 {
-		package { 'libfilesystem-ruby1.9.1':
-			ensure => installed,
-		}
-	} elsif $::lsbmajdistrelease >= 8 {
-		package { 'ruby-filesystem':
-			ensure => installed,
-		}
-	}
-
 	munin::check { [
 			'cpu',
 			'entropy',
@@ -128,24 +132,16 @@ class debian-org {
 	}
 
 	site::aptrepo { 'security':
-		url        => 'http://security.debian.org/',
-		suite      => "${::lsbdistcodename}/updates",
+		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",
-			components => ['main','contrib','non-free']
-		}
-	} else {
-		site::aptrepo { 'debian-lts':
-			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']
 	}
@@ -156,18 +152,17 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
-	#   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
-	#	site::aptrepo { 'proposed-updates':
-	#		url        => $mirror,
-	#		suite      => "${::lsbdistcodename}-proposed-updates",
-	#		components => ['main','contrib','non-free']
-	#	}
-	#} else {
+	if ($::hostname in [] or $::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+		site::aptrepo { 'proposed-updates':
+			url        => $mirror,
+			suite      => "${mungedcodename}-proposed-updates",
+			components => ['main','contrib','non-free']
+		}
+	} else {
 		site::aptrepo { 'proposed-updates':
 			ensure => absent,
 		}
-	#}
+	}
 
 	site::aptrepo { 'debian.org':
 		ensure => absent,
@@ -198,10 +193,15 @@ class debian-org {
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
 		site::aptrepo { 'debian':
 			url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
-			suite      => $::lsbdistcodename,
+			suite      => $mungedcodename,
 			components => ['main','contrib','non-free']
 		}
 	}
+	site::aptrepo { 'debian-cdn':
+		url        => "http://cdn-fastly.deb.debian.org/debian"
+		suite      => $mungedcodename,
+		components => ['main','contrib','non-free']
+	}
 
 	file { '/etc/facter':
 		ensure  => directory,
@@ -274,7 +274,7 @@ class debian-org {
 	}
 	file { '/etc/ldap/ldap.conf':
 		require => Package['debian.org'],
-		source  => 'puppet:///modules/debian-org/ldap.conf',
+		content  => template('debian-org/ldap.conf.erb'),
 	}
 	file { '/etc/pam.d/common-session':
 		require => Package['debian.org'],
@@ -286,7 +286,7 @@ class debian-org {
 	}
 	file { '/etc/rc.local':
 		mode   => '0755',
-		source => 'puppet:///modules/debian-org/rc.local',
+		content => template('debian-org/rc.local.erb'),
 		notify => Exec['service rc.local start'],
 	}
 	file { '/etc/dsa':
@@ -356,6 +356,11 @@ class debian-org {
 		onlyif  => "test -x /bin/systemctl"
 	}
 
+	exec { 'systemd-tmpfiles --create --exclude-prefix=/dev':
+		refreshonly => true,
+		onlyif  => "test -x /bin/systemd-tmpfiles"
+	}
+
 	tidy { '/var/lib/puppet/clientbucket/':
 		age      => '2w',
 		recurse  => 9,