Thcipriani has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247721
Change subject: Remove trebuchet user from wikidev group
......................................................................
Remove trebuchet user from wikidev group
Since user is subsequently removed from the wikidev group by
admin::groupmembers.
Bug: T115760
Change-Id: Ia76c63dda9452569002330ce526d39bba7635d55
---
M manifests/role/deployment.pp
M modules/deployment/manifests/deployment_server.pp
2 files changed, 12 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/247721/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 21ce358..6048e6e 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -14,7 +14,7 @@
include role::deployment::services
class { 'deployment::deployment_server':
- deployer_groups => [$deployment_group],
+ deployment_group => $deployment_group,
}
# set umask for wikidev users so that newly-created files are g+w
diff --git a/modules/deployment/manifests/deployment_server.pp
b/modules/deployment/manifests/deployment_server.pp
index 919712a..4c0941a 100644
--- a/modules/deployment/manifests/deployment_server.pp
+++ b/modules/deployment/manifests/deployment_server.pp
@@ -3,9 +3,12 @@
# Provision a trebuchet deployment server.
#
# == Parameters:
-# - $deployer_groups: Array of unix groups to add to the trebuchet user
+# - $deployment_group: Default value for group ownership of any trebuchet-
+# deployed repositories
#
-class deployment::deployment_server($deployer_groups=[]) {
+class deployment::deployment_server(
+ $deployment_group = undef,
+) {
include ::redis::client::python
ensure_packages([
@@ -34,11 +37,10 @@
}
file { '/srv/patches':
- ensure => 'directory',
- owner => 'root',
- group => $deployer_groups[0], # FIXME: why is this even an array?
- # in practice it's always ['wikidev']
- mode => '0775',
+ ensure => 'directory',
+ owner => 'root',
+ group => $deployment_group,
+ mode => '0775',
}
if $::realm != 'labs' {
@@ -52,9 +54,8 @@
user { 'trebuchet':
shell => '/bin/false',
home => '/nonexistent',
- managehome => true,
+ managehome => false,
gid => 'trebuchet',
- groups => $deployer_groups,
system => true,
}
}
@@ -73,7 +74,7 @@
salt::grain { 'deployment_repo_group':
grain => 'deployment_repo_group',
- value => $deployer_groups[0],
+ value => $deployment_group,
replace => true,
}
--
To view, visit https://gerrit.wikimedia.org/r/247721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia76c63dda9452569002330ce526d39bba7635d55
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
