projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put the puppet motd into /etc/motd on stretch hosts
[mirror/dsa-puppet.git]
/
modules
/
motd
/
manifests
/
init.pp
diff --git
a/modules/motd/manifests/init.pp
b/modules/motd/manifests/init.pp
index
3bf224b
..
d8fba15
100644
(file)
--- a/
modules/motd/manifests/init.pp
+++ b/
modules/motd/manifests/init.pp
@@
-7,10
+7,6
@@
# include motd
#
class motd {
# include motd
#
class motd {
- file { '/etc/update-motd.d':
- ensure => directory,
- mode => '0755'
- }
file { '/etc/motd.tail':
ensure => absent,
}
file { '/etc/motd.tail':
ensure => absent,
}
@@
-20,16
+16,22
@@
class motd {
ensure => link,
target => '/var/run/motd'
}
ensure => link,
target => '/var/run/motd'
}
+ file { '/etc/update-motd.d':
+ ensure => directory,
+ mode => '0755'
+ }
+ file { '/etc/update-motd.d/puppet-motd':
+ notify => undef,
+ mode => '0555',
+ content => template('motd/motd.erb')
+ }
} else {
} else {
+ file { '/etc/update-motd.d/puppet-motd':
+ ensure => absent,
+ }
file { '/etc/motd':
file { '/etc/motd':
-
ensure => link
,
- target => '/run/motd.dynamic'
+
notify => undef
,
+ content => template('motd/motd.erb')
}
}
}
}
-
- file { '/etc/update-motd.d/puppet-motd':
- notify => undef,
- mode => '0555',
- content => template('motd/motd.erb')
- }
}
}