motd cleanups

[dsa-puppet.git] / modules / motd / manifests / init.pp

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 047ef4e5261a47a70e84a65291d85831ae5cf567..8936206439d406bb16f77436477f963d5c2eee11 100644 (file)
--- 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'