projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mirror-anu is on stretch, remove from experimental_apache
[mirror/dsa-puppet.git]
/
modules
/
motd
/
manifests
/
init.pp
diff --git
a/modules/motd/manifests/init.pp
b/modules/motd/manifests/init.pp
index
5f017c9
..
3bf224b
100644
(file)
--- a/
modules/motd/manifests/init.pp
+++ b/
modules/motd/manifests/init.pp
@@
-7,38
+7,29
@@
# include motd
#
class motd {
# 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,
+ }
- file { '/etc/update-motd.d':
- ensure => directory,
- mode => '0755'
- }
- file { '/etc/motd.tail':
- ensure => absent,
+ if versioncmp($::lsbmajdistrelease, '9') < 0 {
+ file { '/etc/motd':
+ ensure => link,
+ target => '/var/run/motd'
}
} else {
}
} else {
- $fname = '/etc/motd.tail'
- $notify = Exec['updatemotd']
- $mode = '0444'
-
- }
-
- file { '/etc/motd':
- ensure => link,
- target => '/var/run/motd'
+ file { '/etc/motd':
+ ensure => link,
+ target => '/run/motd.dynamic'
+ }
}
}
- 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')
}
-
- exec { 'updatemotd':
- command => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
- refreshonly => true,
- }
}
}