X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=8936206439d406bb16f77436477f963d5c2eee11;hb=569888b89fe52c4790db2639db9b7aeb49116232;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..893620643 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,16 +7,36 @@
 #   include motd
 #
 class motd {
+	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.tail':
-		notify  => Exec['updatemotd'],
-		content => template('motd/motd.erb')
 	}
+
 	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,