X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=7e91207fde93b2e10ec3665b0400566efcb39708;hb=9e351e33df29623ac787a2b35b1276446dccca5e;hp=ce88c13e606d908c060b0e2fa5b927e3878a5f03;hpb=fb8ec0aad286fe746ddc6c241ef9611e261edf38;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ce88c13e6..7e91207fd 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -61,13 +61,20 @@ class debian-org {
 		source  => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
 	}
 
+	if ($::lsbmajdistrelease >= 8) {
+		$rubyfs_package = 'ruby-filesystem'
+	} elsif $::lsbmajdistrelease == 7  {
+		$rubyfs_package = 'libfilesystem-ruby1.9'
+	} else {
+		$rubyfs_package = 'libfilesystem-ruby1.8'
+	}
 	package { [
 			'apt-utils',
 			'bash-completion',
 			'dnsutils',
 			'less',
 			'lsb-release',
-			'libfilesystem-ruby1.8',
+			$rubyfs_package,
 			'mtr-tiny',
 			'nload',
 			'pciutils',
@@ -75,16 +82,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',
@@ -159,16 +156,10 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if (($::lsbmajdistrelease) >= 8 and ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386'])) {
-		site::aptrepo { 'volatile':
-			ensure => absent,
-		}
-	} else {
-		site::aptrepo { 'volatile':
-			url        => $mirror,
-			suite      => "${::lsbdistcodename}-updates",
-			components => ['main','contrib','non-free']
-		}
+	site::aptrepo { 'volatile':
+		url        => $mirror,
+		suite      => "${::lsbdistcodename}-updates",
+		components => ['main','contrib','non-free']
 	}
 
 	#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
@@ -289,7 +280,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'],
@@ -371,6 +362,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,