Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/204748
Change subject: Labs: Create /etc/motd unconditionally
......................................................................
Labs: Create /etc/motd unconditionally
Bug: T85307
Change-Id: Iceb1b0f0782a2c9fd36004fda80dff3ad2125008
---
M modules/motd/manifests/init.pp
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/204748/1
diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index ad94a27..ce3bd8a 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -3,8 +3,9 @@
# Module for customizing MOTD (Message of the Day) banners.
#
class motd {
- # For Ubuntu trusty+, pam_motd is configured by sshd's pam configuration to
- # read from /run directly and hence has no need for this.
+ # For Ubuntu trusty+, pam_motd is configured by sshd's pam
+ # configuration to read from /run directly and hence has no need
+ # for this.
#
# For Debian jessie (as of 2014-12-31) the situation is quite complicated:
# https://lists.debian.org/debian-devel/2014/12/msg00368.html
@@ -14,6 +15,15 @@
target => '/var/run/motd',
force => true,
}
+ } elsif $::realm == 'labs' and os_version('ubuntu == trusty') {
+ # In Labs the pam configuration is overwritten, effectively
+ # disabling motds on Trusty instances. Thus we create it
+ # there as a workaround for T85910.
+ file { '/etc/motd':
+ ensure => link,
+ target => '/run/motd.dynamic',
+ force => true,
+ }
} else {
file { '/etc/motd':
ensure => absent,
--
To view, visit https://gerrit.wikimedia.org/r/204748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iceb1b0f0782a2c9fd36004fda80dff3ad2125008
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
