X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=7e91207fde93b2e10ec3665b0400566efcb39708;hb=943dd63ceab3c595cfdff25de2631d5b74f19dc9;hp=8eec93eaf52c058afc450da594568f8a6d04cd3d;hpb=08f0d0dcaeccad3e7950f07581538aae180748fb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 8eec93eaf..7e91207fd 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -63,6 +63,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'
 	}
@@ -80,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',
@@ -370,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,