X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=8936206439d406bb16f77436477f963d5c2eee11;hb=8227165a9fb86f64e11c6fb46bde3878fde08ee0;hp=7c1f74e9beb6f6a72259a36a3c3706b7e6ff3834;hpb=a85df2bee6c3751cb0ebe0a382ddd819da7e7f44;p=dsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 7c1f74e9..89362064 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -1,9 +1,44 @@
+# = 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") ;
+	if $::lsbmajdistrelease >= 7 {
+		$fname  = '/etc/update-motd.d/puppet-motd'
+		$notify = undef
+		$mode   = '0555'
+
+		file { '/etc/update-motd.d':
+			ensure => directory,
+			mode   => '0755'
+		}
+		file { '/etc/motd.tail':
+			ensure => absent,
+		}
+	} else {
+		$fname  = '/etc/motd.tail'
+		$notify = Exec['updatemotd']
+		$mode   = '0444'
+
+	}
+
+	file { '/etc/motd':
+		ensure => link,
+		target => '/var/run/motd'
+	}
+
+	file { $fname:
+		notify  => $notify,
+		mode    => $mode,
+		content => template('motd/motd.erb')
+	}
+
+	exec { 'updatemotd':
+		command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
+		refreshonly => true,
 	}
-        exec { "updatemotd":
-                command => "uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd"
-        }
 }