And samhain ignore the monit files shipped from puppet

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/samhain/files/common/samhainrc b/modules/samhain/files/common/samhainrc
index b7bf0c1..e4ce1cd 100644 (file)
--- 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 7c605a5..fa6a466 100644 (file)
--- 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 630f19c..a0b32e5 100644 (file)
--- 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]
 ##