From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 18 May 2009 06:58:51 +0000 (+0200)
Subject: Move some entries around (staying in the same section) so that the comment is right... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2317f92b357610173a2dfdf09c1d042e6fb3ca0d;p=mirror%2Fdsa-puppet.git

Move some entries around (staying in the same section) so that the comment is right again
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 44950bb2b..bc325c751 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -199,6 +199,9 @@ file=/var/lib/misc/ssh-rsa-shadow
 file=/etc/.da-backup.trace
 file=/etc/postfix/debianhosts
 file=/etc/postfix/debianhosts.db
+file=/etc/blkid.tab
+file=/etc/blkid.tab.old
+file=/etc/resolv.conf.dhclient-new
 
 # We handle these files with puppet - please to not be bothering us
 file=/etc/timezone
@@ -264,12 +267,9 @@ file=/usr/lib/nagios/plugins/dsa-check-raid-sw
 file=/usr/lib/nagios/plugins/dsa-update-samhain-status
 file=/etc/sudoers
 file=/etc/pam.d/sudo
-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
-file=/etc/resolv.conf.dhclient-new
 <%= extrafiles=""
 case fqdn 
 when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg