From: Stephen Gran <steve@lobefin.net>
Date: Sun, 7 Oct 2012 15:01:57 +0000 (+0100)
Subject: no, we like the link
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b995d3636745605f157db17fee86e7113f137ec6;p=mirror%2Fdsa-puppet.git

no, we like the link

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 6f95ff606..99fda5de6 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -13,24 +13,16 @@ class motd {
 		$notify = undef
 		$mode   = '0555'
 
-		file { '/etc/motd':
-			ensure  => present,
-			replace => false
-		}
-
 	} elsif $::lsbdistcodename == 'squeeze' {
 		$fname  = '/etc/motd.tail'
 		$notify = Exec['updatemotd']
 		$mode   = '0444'
 
-		file { '/etc/motd':
-			ensure => link,
-			target => '/var/run/motd'
-		}
-		exec { 'updatemotd':
-			command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
-			refreshonly => true,
-		}
+	}
+
+	file { '/etc/motd':
+		ensure => link,
+		target => '/var/run/motd'
 	}
 
 	file { $fname:
@@ -38,4 +30,9 @@ class motd {
 		mode    => $mode,
 		content => template('motd/motd.erb')
 	}
+
+	exec { 'updatemotd':
+		command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
+		refreshonly => true,
+	}
 }