X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsystemd%2Fmanifests%2Finit.pp;h=2ee492f6e523c36399743ee5012f2aed39d53aa5;hb=1f3cd8bea3ed396c5e1ab35d369e6b72bb27b3f2;hp=08f10fc50db60e88a180df9a211f50a65766c054;hpb=b2fc3cd4df85fc3503b8fb66e3e2d5d6abf76875;p=mirror%2Fdsa-puppet.git

diff --git a/modules/systemd/manifests/init.pp b/modules/systemd/manifests/init.pp
index 08f10fc50..2ee492f6e 100644
--- a/modules/systemd/manifests/init.pp
+++ b/modules/systemd/manifests/init.pp
@@ -6,6 +6,8 @@ class systemd {
 	systemd::mask { 'sys-kernel-debug-tracing.mount': }
 	systemd::mask { 'sys-kernel-debug.mount': }
 
+	include stretch::network_online
+
 	if $::hostname == 'godard' {
 		exec {'mkdir -p /etc/systemd/journald.conf.d':
 			unless => 'test -d /etc/systemd/journald.conf.d',
@@ -13,9 +15,16 @@ class systemd {
 		file { '/etc/systemd/journald.conf.d/persistency.conf':
 			source => 'puppet:///modules/systemd/persistency.conf',
 		}
-		exec {'systemctl force-reload systemd-journald':
-			refreshonly => true
-		}
 	}
 
+	file { '/usr/local/sbin/systemd-cleanup-failed':
+		source => 'puppet:///modules/systemd/systemd-cleanup-failed',
+		mode   => '0555',
+	}
+	concat::fragment { 'dsa-puppet-stuff--systemd-cleanup-failed':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		content  => @("EOF"),
+				*/10 * * * * root /usr/local/sbin/systemd-cleanup-failed
+				| EOF
+	}
 }