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 35de22c..daa29c6 100644 (file)
--- 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