X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Fmanifests%2Finit.pp;h=cb42099c110392ad9474aab485638f95048719c6;hb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;hp=5f017c912950d404ed3a253911735d98ec347194;hpb=2d2d25eb5b5c376c5f73551fa11f5acaf866a60d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 5f017c912..cb42099c1 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,23 +7,12 @@
 #   include motd
 #
 class motd {
-	if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
-		$fname  = '/etc/update-motd.d/puppet-motd'
-		$notify = undef
-		$mode   = '0555'
-
-		file { '/etc/update-motd.d':
-			ensure => directory,
-			mode   => '0755'
-		}
-		file { '/etc/motd.tail':
-			ensure => absent,
-		}
-	} else {
-		$fname  = '/etc/motd.tail'
-		$notify = Exec['updatemotd']
-		$mode   = '0444'
-
+	file { '/etc/update-motd.d':
+		ensure => directory,
+		mode   => '0755'
+	}
+	file { '/etc/motd.tail':
+		ensure => absent,
 	}
 
 	file { '/etc/motd':
@@ -31,9 +20,9 @@ class motd {
 		target => '/var/run/motd'
 	}
 
-	file { $fname:
-		notify  => $notify,
-		mode    => $mode,
+	file { '/etc/update-motd.d/puppet-motd':
+		notify  => undef,
+		mode    => '0555',
 		content => template('motd/motd.erb')
 	}