From: Stephen Gran <steve@lobefin.net>
Date: Mon, 19 Aug 2013 07:34:28 +0000 (+0100)
Subject: stop doing it twice
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7e61e390d278ab594ed572edbacc8df60834ba85;hp=534582223cdfe840ab0a19298f92e7a1b73a30ef;p=mirror%2Fdsa-puppet.git

stop doing it twice

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 1cef8c968..f5e521fd3 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -102,9 +102,6 @@ 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 -%>
 <% if classes.include?("roles::static_mirror") -%>
 file=/etc/apache2/sites-available/static-vhosts-simple
 <% end -%>