X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=01cff6ee760821159fdc64f9cbc5397ff7f7661a;hb=1a3c2dd5f3bf902cc217fa405057cb9c5d0f165d;hp=93905c4ba1de4b3ea4455e07eb89c95bdec4416d;hpb=1d33caf2918eb0ae8c2aee0db8620a77da9c5818;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 93905c4ba..01cff6ee7 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -12,12 +12,8 @@ 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 }
-	}
+	# the virtual facter needs virt-what on jessie to work; clean up.
+	package { 'virt-what': ensure => purged }
 
 	$samhain_recipients = hiera('samhain_recipients')
 	$root_mail_alias = hiera('root_mail_alias')
@@ -118,12 +114,10 @@ class debian_org {
 		content => "Etc/UTC\n",
 		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
 	}
-	if versioncmp($::lsbmajdistrelease, '9') >= 0 { # jessie has a regular file there, for instance
-		file { '/etc/localtime':
-			ensure => 'link',
-			target => '/usr/share/zoneinfo/Etc/UTC',
-			notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
-		}
+	file { '/etc/localtime':
+		ensure => 'link',
+		target => '/usr/share/zoneinfo/Etc/UTC',
+		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
 	}
 	file { '/etc/puppet/puppet.conf':
 		content => template('debian_org/puppet.conf.erb'),