From 8314f82dff0956119ced6b782c9c6df00508216e Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 17 Jul 2017 15:10:34 +0200
Subject: [PATCH] Add haveged service override to work around #858134

---
 manifests/site.pp                 |  1 +
 modules/haveged/manifests/init.pp | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 modules/haveged/manifests/init.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 09559ec34..a01c7c3af 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -42,6 +42,7 @@ node default {
 	include popcon
 	include portforwarder
 	include postgres
+	include haveged
 
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
diff --git a/modules/haveged/manifests/init.pp b/modules/haveged/manifests/init.pp
new file mode 100644
index 000000000..bc8dd4965
--- /dev/null
+++ b/modules/haveged/manifests/init.pp
@@ -0,0 +1,21 @@
+class haveged {
+	$ensure = ($::haveged) ? {
+		true    => 'present',
+		default => 'absent'
+	}
+
+
+	if ($haveged) {
+		service { 'haveged':
+			ensure => running,
+		}
+	}
+
+	# work around #858134
+	systemd::override { 'haveged':
+		content => @(EOT)
+			[Unit]
+			After=systemd-tmpfiles-setup.service
+			| EOT
+	}
+}
-- 
2.20.1