From 08a21d49a4973b76493e3a50d25c3e98f07cb92b Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 11 Feb 2018 10:58:08 +0100 Subject: [PATCH] Move failed rsync cleanup into systemd module --- modules/rsync/manifests/init.pp | 10 +--------- .../files/systemd-cleanup-failed} | 0 modules/systemd/manifests/init.pp | 10 ++++++++++ 3 files changed, 11 insertions(+), 9 deletions(-) rename modules/{rsync/files/systemd-cleanup-failed-rsyncs => systemd/files/systemd-cleanup-failed} (100%) diff --git a/modules/rsync/manifests/init.pp b/modules/rsync/manifests/init.pp index a80582c63..686843ced 100644 --- a/modules/rsync/manifests/init.pp +++ b/modules/rsync/manifests/init.pp @@ -25,14 +25,6 @@ class rsync { } file { '/usr/local/sbin/systemd-cleanup-failed-rsyncs': - source => 'puppet:///modules/rsync/systemd-cleanup-failed-rsyncs', - mode => '0555', - } - file { '/etc/cron.d/puppet-crazy-multipath-restart': ensure => absent, } - concat::fragment { 'dsa-puppet-stuff--systemd-cleanup-failed-rsyncs': - target => '/etc/cron.d/dsa-puppet-stuff', - content => @("EOF"), - */10 * * * * root /usr/local/sbin/systemd-cleanup-failed-rsyncs - | EOF + ensure => absent, } } diff --git a/modules/rsync/files/systemd-cleanup-failed-rsyncs b/modules/systemd/files/systemd-cleanup-failed similarity index 100% rename from modules/rsync/files/systemd-cleanup-failed-rsyncs rename to modules/systemd/files/systemd-cleanup-failed diff --git a/modules/systemd/manifests/init.pp b/modules/systemd/manifests/init.pp index d5b896d31..1dd41cda5 100644 --- a/modules/systemd/manifests/init.pp +++ b/modules/systemd/manifests/init.pp @@ -15,4 +15,14 @@ class systemd { } } + 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 + } } -- 2.20.1