Dzahn has submitted this change and it was merged.
Change subject: aptrepo: make owners of incoming dir configurable
......................................................................
aptrepo: make owners of incoming dir configurable
For different uses (apt.wm vs. releases.wm) we have
different users/groups owning the incoming directory.
Now that we use the same module for them we need to make
it configurable too, for uploads to work like before.
This is not changing the actual owner/group from how it was
before, it's restoring carbon and bromine as they were.
Bug:T132757
Change-Id: I62ecadc06c98b0a4e9e8b755a930e6c5cb38a206
---
M modules/aptrepo/manifests/init.pp
M modules/role/manifests/aptrepo/wikimedia.pp
2 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/aptrepo/manifests/init.pp
b/modules/aptrepo/manifests/init.pp
index 1ac50b3..6339177 100644
--- a/modules/aptrepo/manifests/init.pp
+++ b/modules/aptrepo/manifests/init.pp
@@ -13,6 +13,8 @@
# - *uploaders*: A list of uploaders instructions (see "uploaders file")
# - *incomingdir*: Path considered for incoming uploads.
# - *incomingconf*: Name of a template with config options for incoming
uploads. (conf/incoming)
+# - *incominguser*: The user name that owns the incoming directory.
+# - *incominggroup*: The group name that owns the incoming directory.
# - *default_distro*: The default distribution if none specified.
# - *gpg_secring*: The GPG secret keyring for reprepro to use.
# - *gpg_pubring*: The GPG public keyring for reprepro to use.
@@ -36,6 +38,8 @@
$uploaders = [],
$incomingdir = 'incoming',
$incomingconf = 'incoming',
+ $incominguser = 'reprepro',
+ $incominggroup = 'reprepro',
$default_distro = 'jessie',
$gpg_secring = undef,
$gpg_pubring = undef,
@@ -124,12 +128,11 @@
require => User['reprepro'],
}
- # Allow wikidev users to upload to /srv/wikimedia/incoming
file { "${basedir}/incoming":
ensure => directory,
mode => '1775',
- owner => 'root',
- group => 'wikidev',
+ owner => $incominguser,
+ group => $incominggroup,
}
file { "${basedir}/logs":
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp
b/modules/role/manifests/aptrepo/wikimedia.pp
index 6aa5c81..14485e9 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -4,8 +4,11 @@
$basedir = '/srv/wikimedia'
class { '::aptrepo':
- basedir => $basedir,
- incomingconf => 'incoming-wikimedia',
+ basedir => $basedir,
+ incomingconf => 'incoming-wikimedia',
+ incominguser => 'root',
+ # Allow wikidev users to upload to /srv/wikimedia/incoming
+ incominggroup => 'wikidev',
}
file { "${basedir}/conf/distributions":
--
To view, visit https://gerrit.wikimedia.org/r/292770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62ecadc06c98b0a4e9e8b755a930e6c5cb38a206
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
