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 3a2b697..d8fba15 100644 (file)
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,10 +7,6 @@
 #   include motd
 #
 class motd {
-       file { '/etc/update-motd.d':
-               ensure => directory,
-               mode   => '0755'
-       }
        file { '/etc/motd.tail':
                ensure => absent,
        }
@@ -20,21 +16,22 @@ class 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':
-                       ensure => link,
-                       target => '/run/motd.dynamic'
+                       notify  => undef,
+                       content => template('motd/motd.erb')
                }
        }
-
-       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,
-       }
 }