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 b7bf0c189e2f03224308d77da2c5b876fce3c40b..e4ce1cd3730182e218fab195f585f9cbfb8b3ad9 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 7c605a506e1cc98e02210757f4d0366857e572a5..fa6a4663c05705741631f4676e2fb4e26c1c6d93 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 630f19c9d59d8cf0cc0e6baa1cec0287bf366e95..a0b32e53cb601c5c1042c1d20ba05cc26ea6a644 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]
 ##