X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=8936206439d406bb16f77436477f963d5c2eee11;hb=7b062baee2e55c34f6c71a8f10919492de0bb2c5;hp=99fda5de61b4224103a4c4247fee0bf1315f1232;hpb=b995d3636745605f157db17fee86e7113f137ec6;p=mirror%2Fdsa-puppet.git diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp index 99fda5de6..893620643 100644 --- a/modules/motd/manifests/init.pp +++ b/modules/motd/manifests/init.pp @@ -7,13 +7,19 @@ # include motd # class motd { - - if $::lsbdistcodename == 'wheezy' { + if $::lsbmajdistrelease >= 7 { $fname = '/etc/update-motd.d/puppet-motd' $notify = undef $mode = '0555' - } elsif $::lsbdistcodename == 'squeeze' { + 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'