From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 9 Apr 2013 08:31:25 +0000 (+0200)
Subject: Samhain ignore /etc/static-components.conf on static hosts
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=0de0c52d6ee7de3280436a09a97bebee8fd57a89

Samhain ignore /etc/static-components.conf on static hosts
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 0f227ed7..d4d3355a 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -104,6 +104,9 @@ file=/etc/bind/geodns/recvconf.files
 file=/etc/bind/named.conf.options
 <% end -%>
 file=/etc/apache2/conf.d/puppet-builddlist
+<% if classes.include?("roles::static_base") -%>
+file=/etc/static-components.conf
+<% end -%>
 
 #
 # There are files in /etc that might change, thus changing the directory