X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=eb0c4255eb0c4d78625fc529d2c1cf79e579581e;hb=079c4266fd3f6cbfbf5e97a249859d8da9e11d8d;hp=fdb213570fbfecb0f8089552db941ff709119dfd;hpb=849312d0c4f5bde5705bdb294c914032bab7da37;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index fdb213570..eb0c4255e 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -12,6 +12,13 @@ class debian_org {
 		$servicefiles = 'absent'
 	}
 
+	# the virtual facter needs virt-what on jessie to work
+	if versioncmp($::lsbmajdistrelease, '9') < 0 {
+		package { 'virt-what': ensure => installed }
+	} else {
+		package { 'virt-what': ensure => purged }
+	}
+
 	$debianadmin = [
 		'debian-archive-debian-samhain-reports@master.debian.org',
 		'debian-admin@ftbfs.de',
@@ -251,6 +258,10 @@ class debian_org {
 		owner  => root,
 		group  => root,
 	}
+	file { '/usr/local/bin/dsa-is-shutdown-scheduled':
+		source	=> 'puppet:///modules/debian_org/dsa-is-shutdown-scheduled',
+		mode	=> '0555',
+	}
 
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',