From: Héctor Orón Martínez <zumbi@debian.org>
Date: Wed, 31 Jan 2018 15:16:13 +0000 (+0100)
Subject: godard: enable persistent journald storage. rt#7049
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e4a284ec065e8c4d124a2d351f44965974fffb2f;p=mirror%2Fdsa-puppet.git

godard: enable persistent journald storage. rt#7049

Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>
---

diff --git a/modules/systemd/files/persistency.conf b/modules/systemd/files/persistency.conf
new file mode 100644
index 000000000..efd0286ef
--- /dev/null
+++ b/modules/systemd/files/persistency.conf
@@ -0,0 +1,7 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+[Journal]
+Storage=persistent
diff --git a/modules/systemd/manifests/init.pp b/modules/systemd/manifests/init.pp
index d19de1279..c6362af5a 100644
--- a/modules/systemd/manifests/init.pp
+++ b/modules/systemd/manifests/init.pp
@@ -5,4 +5,11 @@ class systemd {
 
 	systemd::mask { 'sys-kernel-debug-tracing.mount': }
 	systemd::mask { 'sys-kernel-debug.mount': }
+
+	if $::hostname == 'godard' {
+		file { '/etc/systemd/journald.conf.d/persistency.conf':
+			source => 'puppet:///modules/systemd/persistency.conf',
+		}
+	}
+
 }