samosa on afs

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 246808e..d9c46b4 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -68,7 +68,7 @@
 # RedefUser0=(no default)
 # RedefUser1=(no default)
 <% if nodeinfo['buildd'] -%>
-IgnoreMissing=/etc/lvm/archive/vg.*.vg
+IgnoreMissing=/etc/lvm/archive/.*.vg
 <% end -%>
 
 [Attributes]
@@ -136,7 +136,6 @@ file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
 <% if nodeinfo['nagiosmaster'] -%>
 file=/etc/nagios3/puppetconf.d
-file=/etc/puppet
 <% end -%>
 file=/etc/puppet
 file=/etc/cron.d
@@ -150,6 +149,7 @@ file=/etc/syslog-ng
 file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
+file=/etc/rc.local
 
 
 [LogFiles]
@@ -248,6 +248,7 @@ file=/etc/exim4/localusers
 file=/etc/exim4/manualroute
 file=/etc/exim4/rbllist
 file=/etc/exim4/rhsbllist
+file=/etc/exim4/submission-domains
 file=/etc/exim4/virtualdomains
 file=/etc/exim4/whitelist
 file=/etc/exim4/local-settings.conf
@@ -324,6 +325,7 @@ file=/etc/apt/apt.conf.d/local-pdiffs
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey
+file=/etc/default/syslog-ng
 file=/etc/logrotate.d/exim4-paniclog
 file=/etc/logrotate.d/exim4-base
 file=/etc/logrotate.d/syslog-ng
@@ -377,7 +379,7 @@ dir=8/etc/puppet
 <% if classes.include?('named::geodns') -%>
 dir=1/etc/bind/geodns
 <% end -%>
-<% if classes.include?('named::secondary') -%>
+<% if classes.include?('named::authoritative') -%>
 dir=1/etc/bind
 file=/etc/bind/named.conf.debian-zones
 <% end -%>
@@ -392,6 +394,7 @@ dir=1/etc/ferm/dsa.d
 file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
+dir=2/etc/ssl/debian
 
 [IgnoreNone]
 ##
@@ -544,7 +547,7 @@ MailSeverity=crit
 PrintSeverity=none
 LogSeverity=info
 SyslogSeverity=alert
-ExportSeverity=none
+#ExportSeverity=none
 
 
 
@@ -611,7 +614,7 @@ ExportSeverity=none
 
 ## Switch on/off
 #
-KernelCheckActive = True
+#KernelCheckActive = True
 
 ## Check interval (seconds); btw., the check is VERY fast
 #
@@ -629,7 +632,7 @@ KernelCheckActive = True
 
 ## Switch on/off
 #
-LoginCheckActive = True
+# LoginCheckActive = True
 
 ## Severity for logins, multiple logins, logouts
 #