projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tracker chain
[mirror/dsa-puppet.git]
/
modules
/
motd
/
manifests
/
init.pp
diff --git
a/modules/motd/manifests/init.pp
b/modules/motd/manifests/init.pp
index
b200312
..
8936206
100644
(file)
--- a/
modules/motd/manifests/init.pp
+++ b/
modules/motd/manifests/init.pp
@@
-7,8
+7,7
@@
# include motd
#
class motd {
# include motd
#
class motd {
-
- if $::lsbdistcodename == 'wheezy' {
+ if $::lsbmajdistrelease >= 7 {
$fname = '/etc/update-motd.d/puppet-motd'
$notify = undef
$mode = '0555'
$fname = '/etc/update-motd.d/puppet-motd'
$notify = undef
$mode = '0555'
@@
-17,8
+16,10
@@
class motd {
ensure => directory,
mode => '0755'
}
ensure => directory,
mode => '0755'
}
-
- } elsif $::lsbdistcodename == 'squeeze' {
+ file { '/etc/motd.tail':
+ ensure => absent,
+ }
+ } else {
$fname = '/etc/motd.tail'
$notify = Exec['updatemotd']
$mode = '0444'
$fname = '/etc/motd.tail'
$notify = Exec['updatemotd']
$mode = '0444'