Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60024
Change subject: jenkins: get rid of group def (done by systemuser)
......................................................................
jenkins: get rid of group def (done by systemuser)
I have changed the jenkins user and groups to be made with systemuser{}
that takes care of creating the jenkins group and hence caused a
duplicate definition:
Duplicate definition: Group[jenkins] is already defined in file
modules/jenkins/manifests/group.pp at line 7;
cannot redefine at manifests/generic-definitions.pp:34 on
node gallium.wikimedia.org
Change-Id: I8e712f0add8ce01bb47a389c0478a238df962b5a
---
D modules/jenkins/manifests/group.pp
M modules/jenkins/manifests/init.pp
M modules/jenkins/manifests/user.pp
3 files changed, 0 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/60024/1
diff --git a/modules/jenkins/manifests/group.pp
b/modules/jenkins/manifests/group.pp
deleted file mode 100644
index 0cd150d..0000000
--- a/modules/jenkins/manifests/group.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class jenkins::group {
- group { 'jenkins':
- ensure => present,
- name => 'jenkins',
- system => true,
- allowdupe => false,
- }
-}
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index b1a851a..c703485 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -1,6 +1,5 @@
class jenkins {
require jenkins::user
- require jenkins::group
# Upgrades are usually done manually by upload the Jenkins
# package at apt.wikimedia.org then restarting jenkins and
diff --git a/modules/jenkins/manifests/user.pp
b/modules/jenkins/manifests/user.pp
index 54fd621..bbed095 100644
--- a/modules/jenkins/manifests/user.pp
+++ b/modules/jenkins/manifests/user.pp
@@ -1,7 +1,5 @@
class jenkins::user {
- include jenkins::group
-
systemuser { 'jenkins':
name => 'jenkins',
home => '/var/lib/jenkins',
--
To view, visit https://gerrit.wikimedia.org/r/60024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e712f0add8ce01bb47a389c0478a238df962b5a
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
