From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 17 Jul 2017 13:10:34 +0000 (+0200)
Subject: Add haveged service override to work around #858134
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=8314f82dff0956119ced6b782c9c6df00508216e

Add haveged service override to work around #858134
---

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
+	}
+}