Ignore staticsync's ssh keys on static* hosts

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 1a4308d0cc8f25eafd7fc48d56a38fcf3b3cbeaa..0f227ed7b6037e69f8b22adb1654de191a6edbf8 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -156,13 +156,9 @@ file=/etc/ferm/dsa.d
 file=/etc/rc.local
 file=/etc/unbound
 file=/etc/dsa
-<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>
-
-# Damn you rails apps and your shoddy packaging
-file=/usr/share/puppet-dashboard/public/stylesheets
-file=/usr/share/puppet-dashboard/public/javascripts
-file=/usr/share/puppet-dashboard/public/stylesheets/all.css
-file=/usr/share/puppet-dashboard/public/javascripts/all.js
+<% if scope.lookupvar('site::nodeinfo')['static_mirror'] or scope.lookupvar('site::nodeinfo')['static_source'] or scope.lookupvar('site::nodeinfo')['static_master'] -%>
+file=/etc/ssh/userkeys
+file=/etc/ssh/userkeys/staticsync
 <% end -%>
 
 [LogFiles]
@@ -247,6 +243,8 @@ file=/etc/resolv.conf.dhclient-new
 # We handle these files with puppet - please to not be bothering us
 file=/etc/timezone
 file=/etc/motd.tail
+file=/etc/update-motd.d/
+file=/etc/update-motd.d/puppet-motd
 file=/etc/ntp.conf
 file=/etc/samhain/samhainrc
 file=/etc/munin/munin-node.conf
@@ -430,6 +428,15 @@ file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
 file=/etc/unbound/unbound.conf
 
+<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>
+
+# Damn you rails apps and your shoddy packaging
+file=/usr/share/puppet-dashboard/public/stylesheets
+file=/usr/share/puppet-dashboard/public/javascripts
+file=/usr/share/puppet-dashboard/public/stylesheets/all.css
+file=/usr/share/puppet-dashboard/public/javascripts/all.js
+<% end -%>
+
 [IgnoreNone]
 ##
 ## for these files, all modifications (even access time) are reported