decommissioning coincy (RT#4628)

[mirror/dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index d7924ef..f5e521f 100644 (file)
--- 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 -%>
@@ -283,6 +280,7 @@ file=/etc/dsa/cron.ignore.dsa-puppet-stuff
 file=/etc/vsftpd.conf
 file=/etc/aliases
 file=/etc/multipath.conf
+file=/etc/static-components.conf
 <%=
 out=""
 if scope.lookupvar('site::nodeinfo')['heavy_exim']