X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=cb42099c110392ad9474aab485638f95048719c6;hb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;hp=f8726866f0b2a599aa6e1ce9c96bfcb5e3e49591;hpb=88fed06f1b8244ade89153deb977ca11af199e70;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index f8726866f..cb42099c1 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -1,10 +1,33 @@
+# = Class: motd
+#
+# This class configures a sensible motd
+#
+# == Sample Usage:
+#
+#   include motd
+#
 class motd {
-	file { "/etc/motd.tail":
-                notify  => Exec["updatemotd"],
-                content => template("motd.erb") ;
-	}
-        exec { "updatemotd":
-                command => "/bin/uname -snrvm > /var/run/motd && /bin/cat /etc/motd.tail >> /var/run/motd",
-                refreshonly => true
-        }
+	file { '/etc/update-motd.d':
+		ensure => directory,
+		mode   => '0755'
+	}
+	file { '/etc/motd.tail':
+		ensure => absent,
+	}
+
+	file { '/etc/motd':
+		ensure => link,
+		target => '/var/run/motd'
+	}
+
+	file { '/etc/update-motd.d/puppet-motd':
+		notify  => undef,
+		mode    => '0555',
+		content => template('motd/motd.erb')
+	}
+
+	exec { 'updatemotd':
+		command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
+		refreshonly => true,
+	}
 }