Faidon Liambotis has submitted this change and it was merged.
Change subject: ve: switch jsbench/chromium user/groups to system
......................................................................
ve: switch jsbench/chromium user/groups to system
The jsbench user was created and destroyed by "enforce-users-groups" on
every puppet run for months -- this switches it to a system user to
fix this.
The chromium user was not, but this is because enforce-users-groups had
this whitelisted as one out of a very few exceptions. Remove that
exception as well.
Change-Id: I4177b0866b2c5f64ec69dd092ff813d9574cdf0c
---
M manifests/role/jsbench.pp
M modules/admin/files/enforce-users-groups.sh
M modules/chromium/manifests/init.pp
3 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/jsbench.pp b/manifests/role/jsbench.pp
index 06697d2..d71df39 100644
--- a/manifests/role/jsbench.pp
+++ b/manifests/role/jsbench.pp
@@ -25,6 +25,7 @@
ensure => present,
comment => 'Chromium service user for jsbench',
home => '/srv/profile/jsbench',
+ system => true,
managehome => true,
require => File['/srv/profile'],
}
diff --git a/modules/admin/files/enforce-users-groups.sh
b/modules/admin/files/enforce-users-groups.sh
index 9dd79a5..914d2d3 100755
--- a/modules/admin/files/enforce-users-groups.sh
+++ b/modules/admin/files/enforce-users-groups.sh
@@ -18,8 +18,6 @@
"reprepro" \ # caesium.eqiad.wmnet
"mysql" \ # pc1001.eqiad.wmnet
"dbmon" \ # db1044.eqiad.wmnet
- "txstatsd" \ # osmium.eqiad.wmnet
- "chromium" \ # osmium.eqiad.wmnet
"parsoid-rt"); # ruthenium.eqiad.wmnet T90966
log() {
diff --git a/modules/chromium/manifests/init.pp
b/modules/chromium/manifests/init.pp
index 31a8c79..d83f6d6 100644
--- a/modules/chromium/manifests/init.pp
+++ b/modules/chromium/manifests/init.pp
@@ -41,6 +41,7 @@
group { 'chromium':
ensure => $ensure,
+ system => true,
}
user { 'chromium':
@@ -48,6 +49,7 @@
gid => 'chromium',
shell => '/bin/false',
home => '/var/lib/chromium',
+ system => true,
managehome => true,
}
--
To view, visit https://gerrit.wikimedia.org/r/214029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4177b0866b2c5f64ec69dd092ff813d9574cdf0c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
