From: Stephen Gran <steve@lobefin.net>
Date: Sun, 15 Apr 2012 19:50:02 +0000 (+0100)
Subject: move the samhain stuff
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=188ca3ce42a4b446cc153adbf364eeb12fd278f3;p=mirror%2Fdsa-puppet.git

move the samhain stuff

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 84db47869..7cb67a7f9 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -122,8 +122,6 @@ file=/etc/munin
 file=/etc/munin/plugins
 file=/etc/munin/plugin-conf.d
 file=/etc/exim4
-file=/etc/facter
-file=/etc/facter/facts.d
 file=/etc/exim4/ssl
 file=/etc/apt
 file=/etc/apt/apt.conf.d
@@ -409,6 +407,7 @@ dir=4/etc/dsa-kvm
 dir=3/etc/lvm
 <% end -%>
 dir=1/etc/ferm/dsa.d
+dir=3/etc/facter
 file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf