Faidon has submitted this change and it was merged.
Change subject: Revert "create jenkins user with systemuser"
......................................................................
Revert "create jenkins user with systemuser"
Come back to using the user {} definition. systemuser {} defines the
group which would prevents us from keeping the group definition inside
the jenkins module.
This reverts commit bff1865e793de6aa812fe18cfd5b913210e8588e.
Change-Id: I7482ca5dce574e6557656b8c15d640b07df20b0c
---
M modules/jenkins/manifests/user.pp
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/jenkins/manifests/user.pp
b/modules/jenkins/manifests/user.pp
index 54fd621..486c601 100644
--- a/modules/jenkins/manifests/user.pp
+++ b/modules/jenkins/manifests/user.pp
@@ -2,11 +2,16 @@
include jenkins::group
- systemuser { 'jenkins':
+ # We do not use systemuser{} since we would like to keep
+ # the group definition in the jenkins module.
+ user { 'jenkins':
name => 'jenkins',
home => '/var/lib/jenkins',
+ shell => '/bin/bash', # admins need to be able to login
+ gid => 'jenkins',
+ system => true,
managehome => false,
- shell => '/bin/bash',
+ require => Group['jenkins'];
}
}
--
To view, visit https://gerrit.wikimedia.org/r/60385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7482ca5dce574e6557656b8c15d640b07df20b0c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
