From: Stephen Gran <steve@lobefin.net>
Date: Tue, 23 Feb 2010 18:31:49 +0000 (+0000)
Subject: try to make samhain quiet about ferm
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bfa1bf9201ab6b0c4aa77f0c3ac048df6681eb37;p=mirror%2Fdsa-puppet.git

try to make samhain quiet about ferm

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 0ed6a8657..1cfc09e46 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -149,6 +149,8 @@ file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/sysctl.d
 file=/etc/syslog-ng
+file=/etc/ferm/conf.d
+file=/etc/ferm/dsa.d
 
 
 [LogFiles]
@@ -381,6 +383,9 @@ extrafiles
 <% if nodeinfo['buildd'] -%>
 dir=3/etc/lvm
 <% end -%>
+dir=1/etc/ferm/dsa.d
+file=/etc/ferm/conf.d/me.conf
+file=/etc/ferm/conf.d/defs.conf
 
 [IgnoreNone]
 ##