Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/60385


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(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/60385/1

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: newchange
Gerrit-Change-Id: I7482ca5dce574e6557656b8c15d640b07df20b0c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to