From 33df09fcce52d99fdd005b70217c253293205d3d Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Jul 2018 06:50:46 +0200
Subject: [PATCH] Also make setting timezone work on debian 9 (stretch)

---
 modules/debian_org/files/timezone    | 1 -
 modules/debian_org/manifests/init.pp | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 modules/debian_org/files/timezone

diff --git a/modules/debian_org/files/timezone b/modules/debian_org/files/timezone
deleted file mode 100644
index 7f39493bd..000000000
--- a/modules/debian_org/files/timezone
+++ /dev/null
@@ -1 +0,0 @@
-Etc/UTC
diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 151dd571f..6e1c5dadc 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -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
-- 
2.20.1