X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=d9c46b439de10dc9e45daf18b94343ca3e9c7a8b;hb=b6577bf29c47fd9dff8f40aceb200a3f4431dc1a;hp=036be18a949cabd99ce5add958aeeef15ba74745;hpb=090f1c747e8866c1601ec701bed28da44a9008c2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 036be18a9..d9c46b439 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -149,10 +149,7 @@ file=/etc/syslog-ng
 file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
-file=/etc/ssl/debian
-file=/etc/ssl/debian/crls
-file=/etc/ssl/debian/certs
-file=/etc/ssl/debian/keys
+file=/etc/rc.local
 
 
 [LogFiles]
@@ -328,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
@@ -381,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 -%>
@@ -396,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]
 ##
@@ -548,7 +547,7 @@ MailSeverity=crit
 PrintSeverity=none
 LogSeverity=info
 SyslogSeverity=alert
-ExportSeverity=none
+#ExportSeverity=none
 
 
 
@@ -615,7 +614,7 @@ ExportSeverity=none
 
 ## Switch on/off
 #
-KernelCheckActive = True
+#KernelCheckActive = True
 
 ## Check interval (seconds); btw., the check is VERY fast
 #
@@ -633,7 +632,7 @@ KernelCheckActive = True
 
 ## Switch on/off
 #
-LoginCheckActive = True
+# LoginCheckActive = True
 
 ## Severity for logins, multiple logins, logouts
 #