From 05bfa391748bf827189c42c1a79694ca4cef28c3 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 25 Dec 2017 13:28:34 +0100
Subject: [PATCH] merge nagios-wraps crontab into dsa-puppet-stuff

---
 modules/hardware/manifests/raid/proliant.pp |  4 ++--
 modules/nagios/manifests/client.pp          | 14 +++-----------
 modules/samhain/templates/samhainrc.erb     |  2 --
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 60189fc05..a0ab33c74 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -28,8 +28,8 @@ class hardware::raid::proliant {
 		}
 
 		if $::smartarraycontroller_hpsa {
-			concat::fragment { 'dsa-check-hpssacli':
-				target => '/etc/cron.d/puppet-nagios-wraps',
+			concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-hpssacli':
+				target => '/etc/cron.d/dsa-puppet-stuff',
 				order  => '020',
 				content  => @(EOF)
 					27 */2 * * * root sleep $(( $RANDOM \% 900 )); dsa-wrap-nagios-check dsa-check-hpssacli
diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 45acf85c1..94bbf93c6 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -76,17 +76,9 @@ class nagios::client inherits nagios {
 		ensure => absent,
 	}
 
-	concat { '/etc/cron.d/puppet-nagios-wraps': }
-	concat::fragment { 'puppet-nagios-wraps--header':
-		target => '/etc/cron.d/puppet-nagios-wraps',
-		order  => '000',
-		content  => @(EOF)
-			SHELL=/bin/bash
-			PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/nagios/plugins
-			| EOF
-	}
-	concat::fragment { 'dsa-check_puppet_agent':
-		target => '/etc/cron.d/puppet-nagios-wraps',
+	file { '/etc/cron.d/puppet-nagios-wraps': ensure => absent, }
+	concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-puppet-agent':
+		target => '/etc/cron.d/dsa-puppet-stuff',
 		order  => '010',
 		content  => @(EOF)
 			47 * * * * root dsa-wrap-nagios-check -s puppet-agent dsa-check_puppet_agent -d0 -c 28800 -w 18000
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 069135bab..ddc9e3861 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -430,8 +430,6 @@ file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
 file=/etc/monit/monit.d/00debian.org
 file=/etc/cron.d/dsa-puppet-stuff
-file=/etc/cron.d/dsa-buildd
-file=/etc/cron.d/puppet-nagios-wraps
 file=/etc/cron.weekly/stunnel-ekey-restart
 file=/etc/default/schroot
 file=/etc/schroot/default/nssdatabases
-- 
2.20.1