projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use sysconfig.get_config_var(SIZEOF_TIME_T) since that is what we actually care about
[mirror/dsa-puppet.git]
/
modules
/
motd
/
manifests
/
init.pp
diff --git
a/modules/motd/manifests/init.pp
b/modules/motd/manifests/init.pp
index
99fda5d
..
cb42099
100644
(file)
--- a/
modules/motd/manifests/init.pp
+++ b/
modules/motd/manifests/init.pp
@@
-7,17
+7,12
@@
# include motd
#
class motd {
# include motd
#
class motd {
-
- if $::lsbdistcodename == 'wheezy' {
- $fname = '/etc/update-motd.d/puppet-motd'
- $notify = undef
- $mode = '0555'
-
- } elsif $::lsbdistcodename == 'squeeze' {
- $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':
}
file { '/etc/motd':
@@
-25,9
+20,9
@@
class motd {
target => '/var/run/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')
}
content => template('motd/motd.erb')
}