X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=d8fba15db3a56bd3de061e5cd36a366c89bd5b47;hb=964f9d38eecad5a907420c5cd389fdafc4949777;hp=5f017c912950d404ed3a253911735d98ec347194;hpb=2d2d25eb5b5c376c5f73551fa11f5acaf866a60d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 5f017c912..d8fba15db 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,38 +7,31 @@
 #   include motd
 #
 class motd {
-	if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
-		$fname  = '/etc/update-motd.d/puppet-motd'
-		$notify = undef
-		$mode   = '0555'
+	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/motd.tail':
-			ensure => absent,
+		file { '/etc/update-motd.d/puppet-motd':
+			notify  => undef,
+			mode    => '0555',
+			content => template('motd/motd.erb')
 		}
 	} 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,
+		file { '/etc/update-motd.d/puppet-motd':
+			ensure => absent,
+		}
+		file { '/etc/motd':
+			notify  => undef,
+			content => template('motd/motd.erb')
+		}
 	}
 }