Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118071
Change subject: Tweak l10nupdate user/group creations for beta cluster
......................................................................
Tweak l10nupdate user/group creations for beta cluster
Refer to l10nupdate group by its name instead of uid
The l10nupdate group is created with gid 10002 in groups::l10nupdate
which is required just before generic::systemuser, hence we do not have
to hardcode the gid when creating the user.
I have created on wikitech a l10nupdate user which has the UID 4716,
make mediawiki::user::l10nupdate use that UID whenever it is being run
on labs. Production still assigning per server UIDs.
Bug: 62529
Change-Id: I005953dd65579893980a80f3e3341520a0281d18
---
M modules/generic/manifests/systemuser.pp
M modules/mediawiki/manifests/users/l10nupdate.pp
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/118071/1
diff --git a/modules/generic/manifests/systemuser.pp
b/modules/generic/manifests/systemuser.pp
index a3da93c..b2ba971 100644
--- a/modules/generic/manifests/systemuser.pp
+++ b/modules/generic/manifests/systemuser.pp
@@ -1,5 +1,5 @@
# Creates a system username with associated group, random uid/gid, and
/bin/false as shell
-define generic::systemuser($name, $home=undef, $managehome=true,
$shell='/bin/false', $groups=undef, $default_group=$name, $ensure=present) {
+define generic::systemuser($name, $home=undef, $managehome=true,
$shell='/bin/false', $groups=undef, $uid=undef, $default_group=$name,
$ensure=present) {
# FIXME: deprecate $name parameter in favor of just using $title
if $default_group == $name {
@@ -24,5 +24,6 @@
shell => $shell,
groups => $groups,
system => true,
+ uid => $uid,
}
}
diff --git a/modules/mediawiki/manifests/users/l10nupdate.pp
b/modules/mediawiki/manifests/users/l10nupdate.pp
index cdb113d..f2f4dbb 100644
--- a/modules/mediawiki/manifests/users/l10nupdate.pp
+++ b/modules/mediawiki/manifests/users/l10nupdate.pp
@@ -5,7 +5,12 @@
require groups::l10nupdate
- generic::systemuser { 'l10nupdate': name => 'l10nupdate', home =>
'/home/l10nupdate', default_group => 10002, shell => '/bin/bash' }
+ $uid = $::realm ? {
+ 'labs' => 4716, # LDAP user created via Wikitech
+ default => undef,
+ }
+
+ generic::systemuser { 'l10nupdate': name => 'l10nupdate', home =>
'/home/l10nupdate', uid => $uid, default_group => 'l10nupdate', shell =>
'/bin/bash' }
file {
"/home/l10nupdate/.ssh":
--
To view, visit https://gerrit.wikimedia.org/r/118071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I005953dd65579893980a80f3e3341520a0281d18
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
