setup-dchroot: fix root directory permissions

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

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index ffa8573..cb42099 100644 (file)
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -1,14 +1,31 @@
+# = Class: motd
+#
+# This class configures a sensible motd
+#
+# == Sample Usage:
+#
+#   include motd
+#
 class motd {
-
+       file { '/etc/update-motd.d':
+               ensure => directory,
+               mode   => '0755'
+       }
        file { '/etc/motd.tail':
-               notify  => Exec['updatemotd'],
-               content => template('motd/motd.erb')
+               ensure => absent,
        }
+
        file { '/etc/motd':
                ensure => link,
                target => '/var/run/motd'
        }
 
+       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,