Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/118699
Change subject: beta: skip mwdeploy user creation ...................................................................... beta: skip mwdeploy user creation In labs, the mwdeploy user is provisionned via LDAP, so skip the user creation entirely. The homedir needs to be created by puppet though. Change-Id: Ie232d8337e7b4dc4b80b3b43eceae3ab597b47b3 --- M modules/mediawiki/manifests/users/mwdeploy.pp 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/99/118699/1 diff --git a/modules/mediawiki/manifests/users/mwdeploy.pp b/modules/mediawiki/manifests/users/mwdeploy.pp index 6b9f204..c36691d 100644 --- a/modules/mediawiki/manifests/users/mwdeploy.pp +++ b/modules/mediawiki/manifests/users/mwdeploy.pp @@ -1,5 +1,17 @@ # mediawiki base mw deploy user class mediawiki::users::mwdeploy { - ## mwdeploy user - generic::systemuser { 'mwdeploy': name => 'mwdeploy' } + + ## mwdeploy user + if $::realm != 'labs' { + generic::systemuser { 'mwdeploy': name => 'mwdeploy' } + } else { + # User created in LDAP + file { '/var/lib/mwdeploy': + ensure => directory, + owner => 'mwdeploy', + group => 'mwdeploy', + mode => '0755', + } + } + } -- To view, visit https://gerrit.wikimedia.org/r/118699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie232d8337e7b4dc4b80b3b43eceae3ab597b47b3 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