X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=6bb70c52d5f9aeb936182b7d7fee8d73321dc1c4;hb=66f585903d421f4ad5a83715d782000a679636a1;hp=151dd571ffee2e032713174a3fcd1f572309acc4;hpb=f2c3ac3b6d62f9e0d049e370aa031daea503b7c7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 151dd571f..6bb70c52d 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -6,7 +6,7 @@ class debian_org {
 	include debian_org::apt
 
 	if $systemd {
-		include systemd
+		include dsa_systemd
 		$servicefiles = 'present'
 	} else {
 		$servicefiles = 'absent'
@@ -121,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