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

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 99fda5de6..3bf224b79 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,32 +7,29 @@
 #   include motd
 #
 class motd {
-
-	if $::lsbdistcodename == 'wheezy' {
-		$fname  = '/etc/update-motd.d/puppet-motd'
-		$notify = undef
-		$mode   = '0555'
-
-	} elsif $::lsbdistcodename == 'squeeze' {
-		$fname  = '/etc/motd.tail'
-		$notify = Exec['updatemotd']
-		$mode   = '0444'
-
+	file { '/etc/update-motd.d':
+		ensure => directory,
+		mode   => '0755'
 	}
-
-	file { '/etc/motd':
-		ensure => link,
-		target => '/var/run/motd'
+	file { '/etc/motd.tail':
+		ensure => absent,
 	}
 
-	file { $fname:
-		notify  => $notify,
-		mode    => $mode,
-		content => template('motd/motd.erb')
+	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')
 	}
 }