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