X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=8936206439d406bb16f77436477f963d5c2eee11;hb=7fcd3b79c6af679888217733c2f2b3772020f677;hp=b200312722781191961dee53acee6b9e50ef7cc7;hpb=59f1a085fd7e325e85cea008906859542bc65778;p=mirror%2Fdsa-puppet.git

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