X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=d8fba15db3a56bd3de061e5cd36a366c89bd5b47;hb=0e95fbdd080c4c7156bf2c4f938c0b85629a3981;hp=e8e6bcc0fa2033c1ea1411375b2852d275a187d0;hpb=61b1f29e849df28f2892efc5f98318611e99eeeb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index e8e6bcc0f..d8fba15db 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,18 +7,31 @@
 #   include motd
 #
 class motd {
-
 	file { '/etc/motd.tail':
-		notify  => Exec['updatemotd'],
-		content => template('motd/motd.erb')
-	}
-	file { '/etc/motd':
-		ensure => link,
-		target => '/var/run/motd'
+		ensure => absent,
 	}
 
-	exec { 'updatemotd':
-		command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
-		refreshonly => true,
+	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')
+		}
 	}
 }