X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=cb42099c110392ad9474aab485638f95048719c6;hb=d46e15fc9edead0044eb283fc6c5d57fc383bda3;hp=e8e6bcc0fa2033c1ea1411375b2852d275a187d0;hpb=61b1f29e849df28f2892efc5f98318611e99eeeb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index e8e6bcc0f..cb42099c1 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,16 +7,25 @@
 #   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,