X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=cb42099c110392ad9474aab485638f95048719c6;hb=15e234466d6e879052f6ed5e7305ab4a44486497;hp=ffa85733236dc642beebd22ed6d617ad0e6caafa;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index ffa857332..cb42099c1 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -1,14 +1,31 @@
+# = Class: motd
+#
+# This class configures a sensible motd
+#
+# == Sample Usage:
+#
+#   include motd
+#
 class motd {
-
+	file { '/etc/update-motd.d':
+		ensure => directory,
+		mode   => '0755'
+	}
 	file { '/etc/motd.tail':
-		notify  => Exec['updatemotd'],
-		content => template('motd/motd.erb')
+		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,