exim blacklist: add more recent spammers

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

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