X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=6e1c5dadcfdbf1f362d0cb04f04047ac08852154;hb=b54f52d2899c5785923c804fdfbba0782c147da4;hp=db17a742d20011f2919f81714fa557348f1a1672;hpb=a806e9bc06db60fa713e999ff3092e476ac4cfd5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index db17a742d..6e1c5dadc 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -42,18 +42,13 @@ class debian_org {
 		tag    => extra_repo,
 	}
 
-	if versioncmp($::lsbmajdistrelease, '8') >= 0 {
-		$rubyfs_package = 'ruby-filesystem'
-	} else {
-		$rubyfs_package = 'libfilesystem-ruby1.9'
-	}
 	package { [
 			'apt-utils',
 			'bash-completion',
 			'dnsutils',
 			'less',
 			'lsb-release',
-			$rubyfs_package,
+			'ruby-filesystem',
 			'mtr-tiny',
 			'nload',
 			'pciutils',
@@ -126,9 +121,16 @@ class debian_org {
 		content => template('debian_org/debian_facts.yaml.erb')
 	}
 	file { '/etc/timezone':
-		source => 'puppet:///modules/debian_org/timezone',
+		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'],
+		}
+	}
 	if $::hostname == handel {
 		include puppetmaster::db
 		$dbpassword = $puppetmaster::db::password