Let people know why their mail is being rejected with the new check

[mirror/dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 6d3e1a4..27fc720 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -127,6 +127,7 @@ file=/usr/sbin
 file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
+file=/etc/syslog-ng
 
 
 [LogFiles]
@@ -199,6 +200,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
@@ -239,6 +243,8 @@ file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/logrotate.d/exim4-paniclog
 file=/etc/logrotate.d/exim4-base
+file=/etc/logrotate.d/syslog-ng
+file=/etc/syslog-ng/syslog-ng.conf
 file=/usr/sbin/dsa-update-apt-status
 file=/usr/sbin/dsa-update-samhain-status
 file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
@@ -264,12 +270,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
@@ -278,7 +281,7 @@ file=/etc/nagios3/puppetconf.d/auto-services.cfg
 file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg
 file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg"
-when "handel.debian.org": extradir="dir=8/etc/puppet"
+when "handel.debian.org": extrafiles="dir=8/etc/puppet"
 end
 extrafiles
 %>