some tidy up

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

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 99fda5d..047ef4e 100644 (file)
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -13,6 +13,10 @@ class motd {
                $notify = undef
                $mode   = '0555'
 
+               file { '/etc/update-motd.d':
+                       ensure => directory,
+               }
+
        } elsif $::lsbdistcodename == 'squeeze' {
                $fname  = '/etc/motd.tail'
                $notify = Exec['updatemotd']

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 1a4308d..d25138f 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -156,14 +156,6 @@ 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
-<% end -%>
 
 [LogFiles]
 ##
@@ -247,6 +239,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 +424,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