From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 30 Jul 2013 19:18:45 +0000 (+0200)
Subject: Ignore lvm files for samhain on all machines, not just buildds
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6155386900f486c32cf15a41460647f0a5f2ec46;p=mirror%2Fdsa-puppet.git

Ignore lvm files for samhain on all machines, not just buildds
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 061b70cba..a829b02e2 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -67,9 +67,7 @@
 # RedefIgnoreNone=(no default)
 # RedefUser0=(no default)
 # RedefUser1=(no default)
-<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
 IgnoreMissing=/etc/lvm/archive/.*.vg
-<% end -%>
 
 [Attributes]
 ##
@@ -422,9 +420,8 @@ dir=1/etc/bind/geodns
 dir=1/etc/bind
 file=/etc/bind/named.conf.debian-zones
 <% end -%>
-<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
-dir=3/etc/lvm
-<% end -%>
+dir=3/etc/lvm/archive
+dir=3/etc/lvm/backup
 dir=1/etc/ferm/dsa.d
 dir=1/etc/ferm/conf.d
 dir=3/etc/facter