X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=b3defd5ca8fcf7257030f678c888da7c06af2597;hb=0c805660b1758c91ab2d82fc645203a704537584;hp=2072ae69c1038c3d233df088e5798f04497f0081;hpb=c44807b6b28b20269b90da0a77235f256b72a9df;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 2072ae69c..b3defd5ca 100644
--- 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]
@@ -79,6 +79,7 @@ file=/etc/mtab
 file=/etc/ssh_random_seed
 file=/etc/asound.conf
 <% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
+<% else -%>
 file=/etc/resolv.conf
 <% end -%>
 file=/etc/localtime
@@ -135,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
@@ -247,6 +247,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
@@ -391,6 +392,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]
 ##
@@ -543,7 +545,7 @@ MailSeverity=crit
 PrintSeverity=none
 LogSeverity=info
 SyslogSeverity=alert
-ExportSeverity=none
+#ExportSeverity=none
 
 
 
@@ -610,7 +612,7 @@ ExportSeverity=none
 
 ## Switch on/off
 #
-KernelCheckActive = True
+#KernelCheckActive = True
 
 ## Check interval (seconds); btw., the check is VERY fast
 #
@@ -628,7 +630,7 @@ KernelCheckActive = True
 
 ## Switch on/off
 #
-LoginCheckActive = True
+# LoginCheckActive = True
 
 ## Severity for logins, multiple logins, logouts
 #