acker -> conova-node02

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

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index e8e6bcc..d8fba15 100644 (file)
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,18 +7,31 @@
 #   include motd
 #
 class motd {
-
        file { '/etc/motd.tail':
-               notify  => Exec['updatemotd'],
-               content => template('motd/motd.erb')
-       }
-       file { '/etc/motd':
-               ensure => link,
-               target => '/var/run/motd'
+               ensure => absent,
        }
 
-       exec { 'updatemotd':
-               command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
-               refreshonly => true,
+       if versioncmp($::lsbmajdistrelease, '9') < 0 {
+               file { '/etc/motd':
+                       ensure => link,
+                       target => '/var/run/motd'
+               }
+               file { '/etc/update-motd.d':
+                       ensure => directory,
+                       mode   => '0755'
+               }
+               file { '/etc/update-motd.d/puppet-motd':
+                       notify  => undef,
+                       mode    => '0555',
+                       content => template('motd/motd.erb')
+               }
+       } else {
+               file { '/etc/update-motd.d/puppet-motd':
+                       ensure => absent,
+               }
+               file { '/etc/motd':
+                       notify  => undef,
+                       content => template('motd/motd.erb')
+               }
        }
 }