BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134519
Change subject: [WIP] labs: Fix beta to work with role::mediawiki
......................................................................
[WIP] labs: Fix beta to work with role::mediawiki
role::applicationserver was renamed to role::mediawiki and several
additional cleanup steps were taken in related puppet code. The changed
code left some issues that need to be cleaned up to work properly in the
deployment-prep (beta) labs project.
* Don't create mwdeploy user or group in labs. This conflicts with
LDAP.
* Don't create l10nupdate user or group in labs. This conflicts with
LDAP.
Change-Id: I1e8a28d576cd67348625125238cda47628fa476a
---
M modules/mediawiki/manifests/users.pp
1 file changed, 39 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/134519/1
diff --git a/modules/mediawiki/manifests/users.pp
b/modules/mediawiki/manifests/users.pp
index d1b3517..5006bf8 100644
--- a/modules/mediawiki/manifests/users.pp
+++ b/modules/mediawiki/manifests/users.pp
@@ -29,35 +29,51 @@
# The mwdeploy account is used by various scripts in the MediaWiki
# deployment process to run rsync.
+ if $::realm != 'labs' {
+ group { 'mwdeploy':
+ ensure => present,
+ system => true,
+ }
- group { 'mwdeploy':
- ensure => present,
- system => true,
+ user { 'mwdeploy':
+ ensure => present,
+ shell => '/bin/false',
+ home => '/var/lib/mwdeploy',
+ system => true,
+ managehome => true,
+ }
+ } else {
+ file { '/var/lib/mwdeploy':
+ ensure => directory,
+ owner => 'mwdeploy',
+ group => 'mwdeploy',
+ mode => '0755',
+ }
}
-
- user { 'mwdeploy':
- ensure => present,
- shell => '/bin/false',
- home => '/var/lib/mwdeploy',
- system => true,
- managehome => true,
- }
-
# The l10nupdate account is used for updating the localisation files
# with new interface message translations.
+ if $::realm != 'labs' {
+ group { 'l10nupdate':
+ ensure => present,
+ gid => 10002,
+ }
- group { 'l10nupdate':
- ensure => present,
- gid => 10002,
- }
-
- user { 'l10nupdate':
- ensure => present,
- gid => 10002,
- shell => '/bin/bash',
- home => '/home/l10nupdate',
- managehome => true,
+ user { 'l10nupdate':
+ ensure => present,
+ gid => 10002,
+ shell => '/bin/bash',
+ home => '/home/l10nupdate',
+ managehome => true,
+ }
+ } else {
+ file { '/home/l10nupdate':
+ owner => 'l10nupdate',
+ group => 'l10nupdate',
+ mode => '0750',
+ ensure => directory,
+ before => File['/home/l10nupdate/.ssh'],
+ }
}
file { '/home/l10nupdate/.ssh':
--
To view, visit https://gerrit.wikimedia.org/r/134519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e8a28d576cd67348625125238cda47628fa476a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
