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 7c1f74e..d8fba15 100644 (file)
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -1,9 +1,37 @@
+# = Class: motd
+#
+# This class configures a sensible motd
+#
+# == Sample Usage:
+#
+#   include motd
+#
 class motd {
-       file { "/etc/motd.tail":
-                notify  => Exec["updatemotd"],
-                content => template("motd.erb") ;
+       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/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')
+               }
        }
-        exec { "updatemotd":
-                command => "uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd"
-        }
 }