X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=d8fba15db3a56bd3de061e5cd36a366c89bd5b47;hb=7c041353f4da829d409830eba2e95946952e817f;hp=3bf224b791f5157e526c75449d9b338fa8bf87ab;hpb=6c85e519c941708efc164a51004d63c477a8b9b8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 3bf224b79..d8fba15db 100644
--- 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,16 +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')
-	}
 }