X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=3bf224b791f5157e526c75449d9b338fa8bf87ab;hb=6c85e519c941708efc164a51004d63c477a8b9b8;hp=c5c823926e3cd3385158e290eabcaa40c88dd0ad;hpb=0eff6d9838c5934a6c9c8d11e43e567965c45f0b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index c5c823926..3bf224b79 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -1,9 +1,35 @@
+# = 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") ;
+	file { '/etc/update-motd.d':
+		ensure => directory,
+		mode   => '0755'
+	}
+	file { '/etc/motd.tail':
+		ensure => absent,
+	}
+
+	if versioncmp($::lsbmajdistrelease, '9') < 0 {
+		file { '/etc/motd':
+			ensure => link,
+			target => '/var/run/motd'
+		}
+	} else {
+		file { '/etc/motd':
+			ensure => link,
+			target => '/run/motd.dynamic'
+		}
+	}
+
+	file { '/etc/update-motd.d/puppet-motd':
+		notify  => undef,
+		mode    => '0555',
+		content => template('motd/motd.erb')
 	}
-        exec { "updatemotd":
-                command => "/bin/uname -snrvm > /var/run/motd && /bin/cat /etc/motd.tail >> /var/run/motd"
-        }
 }