Use sysconfig.get_config_var(SIZEOF_TIME_T) since that is what we actually care about

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

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 6f95ff6..cb42099 100644 (file)
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,35 +7,27 @@
 #   include motd
 #
 class motd {
+       file { '/etc/update-motd.d':
+               ensure => directory,
+               mode   => '0755'
+       }
+       file { '/etc/motd.tail':
+               ensure => absent,
+       }
 
-       if $::lsbdistcodename == 'wheezy' {
-               $fname  = '/etc/update-motd.d/puppet-motd'
-               $notify = undef
-               $mode   = '0555'
-
-               file { '/etc/motd':
-                       ensure  => present,
-                       replace => false
-               }
-
-       } elsif $::lsbdistcodename == 'squeeze' {
-               $fname  = '/etc/motd.tail'
-               $notify = Exec['updatemotd']
-               $mode   = '0444'
-
-               file { '/etc/motd':
-                       ensure => link,
-                       target => '/var/run/motd'
-               }
-               exec { 'updatemotd':
-                       command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
-                       refreshonly => true,
-               }
+       file { '/etc/motd':
+               ensure => link,
+               target => '/var/run/motd'
        }
 
-       file { $fname:
-               notify  => $notify,
-               mode    => $mode,
+       file { '/etc/update-motd.d/puppet-motd':
+               notify  => undef,
+               mode    => '0555',
                content => template('motd/motd.erb')
        }
+
+       exec { 'updatemotd':
+               command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
+               refreshonly => true,
+       }
 }