X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=8936206439d406bb16f77436477f963d5c2eee11;hb=75bf6c3a213d5dd70860cd17e89463b881268f20;hp=047ef4e5261a47a70e84a65291d85831ae5cf567;hpb=def5cc4e6d4d2409d32f9eca4281d7a15a105843;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 047ef4e52..893620643 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,17 +7,19 @@
 #   include motd
 #
 class motd {
-
-	if $::lsbdistcodename == 'wheezy' {
+	if $::lsbmajdistrelease >= 7 {
 		$fname  = '/etc/update-motd.d/puppet-motd'
 		$notify = undef
 		$mode   = '0555'
 
 		file { '/etc/update-motd.d':
 			ensure => directory,
+			mode   => '0755'
 		}
-
-	} elsif $::lsbdistcodename == 'squeeze' {
+		file { '/etc/motd.tail':
+			ensure => absent,
+		}
+	} else {
 		$fname  = '/etc/motd.tail'
 		$notify = Exec['updatemotd']
 		$mode   = '0444'