From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Apr 2009 11:00:07 +0000 (+0200)
Subject: Merge common samhainrc changes into handel's version
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=92512b06890ea22b5e1d00a302ee76dbd0178833;p=dsa-puppet.git

Merge common samhainrc changes into handel's version
---

diff --git a/modules/samhain/files/per-host/handel.debian.org/samhainrc b/modules/samhain/files/per-host/handel.debian.org/samhainrc
index 35de22c5..daa29c67 100644
--- a/modules/samhain/files/per-host/handel.debian.org/samhainrc
+++ b/modules/samhain/files/per-host/handel.debian.org/samhainrc
@@ -218,8 +218,8 @@ file=/etc/logrotate.d/exim4-base
 dir=4/etc/puppet
 file=/usr/sbin/dsa-update-apt-status
 file=/usr/sbin/dsa-update-samhain-status
-file=/etc/nagios/nrpe_dsa.cfg
-file=/etc/cron.d/dsa-nagios-nrpe-config
+file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
+file=/etc/nagios/obsolete-packages-ignore
 file=/usr/lib/nagios/plugins/dsa-check-packages
 file=/usr/lib/nagios/plugins/dsa-check-soas
 file=/usr/lib/nagios/plugins/dsa-check-mirrorsync