projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only user planet should call static-update-component on senfl. allow debwww to call...
[mirror/dsa-puppet.git]
/
modules
/
motd
/
manifests
/
init.pp
diff --git
a/modules/motd/manifests/init.pp
b/modules/motd/manifests/init.pp
index
6f95ff6
..
b200312
100644
(file)
--- a/
modules/motd/manifests/init.pp
+++ b/
modules/motd/manifests/init.pp
@@
-13,9
+13,9
@@
class motd {
$notify = undef
$mode = '0555'
$notify = undef
$mode = '0555'
- file { '/etc/
mot
d':
- ensure
=> present
,
- replace => false
+ file { '/etc/
update-motd.
d':
+ ensure
=> directory
,
+ mode => '0755'
}
} elsif $::lsbdistcodename == 'squeeze' {
}
} elsif $::lsbdistcodename == 'squeeze' {
@@
-23,14
+23,11
@@
class motd {
$notify = Exec['updatemotd']
$mode = '0444'
$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:
}
file { $fname:
@@
-38,4
+35,9
@@
class motd {
mode => $mode,
content => template('motd/motd.erb')
}
mode => $mode,
content => template('motd/motd.erb')
}
+
+ exec { 'updatemotd':
+ command => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
+ refreshonly => true,
+ }
}
}