X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=3bf224b791f5157e526c75449d9b338fa8bf87ab;hb=6c85e519c941708efc164a51004d63c477a8b9b8;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..3bf224b79 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -1,16 +1,35 @@
+# = 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'
+
+	if versioncmp($::lsbmajdistrelease, '9') < 0 {
+		file { '/etc/motd':
+			ensure => link,
+			target => '/var/run/motd'
+		}
+	} else {
+		file { '/etc/motd':
+			ensure => link,
+			target => '/run/motd.dynamic'
+		}
 	}
 
-	exec { 'updatemotd':
-		command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
-		refreshonly => true,
+	file { '/etc/update-motd.d/puppet-motd':
+		notify  => undef,
+		mode    => '0555',
+		content => template('motd/motd.erb')
 	}
 }