From 06bd7b1646fead1b1fa664e9ca6fccb76409bea1 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 13 Apr 2009 15:49:21 +0100 Subject: [PATCH] And samhain ignore the monit files shipped from puppet Signed-off-by: Stephen Gran --- modules/samhain/files/common/samhainrc | 6 ++++++ modules/samhain/files/per-host/handel.debian.org/samhainrc | 5 +++++ modules/samhain/files/per-host/spohr.debian.org/samhainrc | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/modules/samhain/files/common/samhainrc b/modules/samhain/files/common/samhainrc index b7bf0c189..e4ce1cd37 100644 --- a/modules/samhain/files/common/samhainrc +++ b/modules/samhain/files/common/samhainrc @@ -117,6 +117,9 @@ file=/etc/nagios/nrpe.d file=/etc/cron.d file=/usr/lib/nagios/plugins file=/usr/sbin +file=/etc/monit +file=/etc/monit/monit.d + [LogFiles] ## @@ -253,6 +256,9 @@ file=/usr/lib/nagios/plugins/dsa-update-samhain-status file=/etc/sudoers file=/etc/blkid.tab file=/etc/blkid.tab.old +file=/etc/monit/monitrc +file=/etc/monit/monit.d/01puppet +file=/etc/monit/monit.d/00debian.org [IgnoreNone] ## diff --git a/modules/samhain/files/per-host/handel.debian.org/samhainrc b/modules/samhain/files/per-host/handel.debian.org/samhainrc index 7c605a506..fa6a4663c 100644 --- a/modules/samhain/files/per-host/handel.debian.org/samhainrc +++ b/modules/samhain/files/per-host/handel.debian.org/samhainrc @@ -117,6 +117,8 @@ file=/etc/nagios/nrpe.d file=/etc/cron.d file=/usr/lib/nagios/plugins file=/usr/sbin +file=/etc/monit +file=/etc/monit/monit.d [LogFiles] ## @@ -253,6 +255,9 @@ file=/usr/lib/nagios/plugins/dsa-update-samhain-status file=/etc/sudoers file=/etc/blkid.tab file=/etc/blkid.tab.old +file=/etc/monit/monitrc +file=/etc/monit/monit.d/01puppet +file=/etc/monit/monit.d/00debian.org [IgnoreNone] ## diff --git a/modules/samhain/files/per-host/spohr.debian.org/samhainrc b/modules/samhain/files/per-host/spohr.debian.org/samhainrc index 630f19c9d..a0b32e53c 100644 --- a/modules/samhain/files/per-host/spohr.debian.org/samhainrc +++ b/modules/samhain/files/per-host/spohr.debian.org/samhainrc @@ -118,6 +118,8 @@ file=/etc/nagios3/puppetconf.d file=/etc/cron.d file=/usr/lib/nagios/plugins file=/usr/sbin +file=/etc/monit +file=/etc/monit/monit.d [LogFiles] ## @@ -259,6 +261,9 @@ file=/usr/lib/nagios/plugins/dsa-update-samhain-status file=/etc/sudoers file=/etc/blkid.tab file=/etc/blkid.tab.old +file=/etc/monit/monitrc +file=/etc/monit/monit.d/01puppet +file=/etc/monit/monit.d/00debian.org [IgnoreNone] ## -- 2.20.1