jenkins-bot has submitted this change and it was merged.
Change subject: MWMultiVersion: allow wiki to be specified via the environment
......................................................................
MWMultiVersion: allow wiki to be specified via the environment
* If no --wiki argument is present, but MW_WIKI is set in the environment, use
MW_WIKI.
* Add MWMinimalScriptInit.php as a proposed entrypoint for mwrepl.
Change-Id: Id432e25c02045065764e2515c971df234b76dc03
---
A multiversion/MWMinimalScriptInit.php
M multiversion/MWMultiVersion.php
2 files changed, 12 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/MWMinimalScriptInit.php
b/multiversion/MWMinimalScriptInit.php
new file mode 100644
index 0000000..825188a
--- /dev/null
+++ b/multiversion/MWMinimalScriptInit.php
@@ -0,0 +1,10 @@
+<?php
+call_user_func( function () {
+ $user = posix_getpwuid( posix_geteuid() );
+ if ( PHP_SAPI !== 'cli' || $user['name'] !== getenv(
'MEDIAWIKI_WEB_USER' ) ) {
+ fprintf( STDERR, "Bad user or SAPI.\n" );
+ die( 1 );
+ }
+} );
+@require_once '/srv/mediawiki/multiversion/MWVersion.php';
+@require_once getMediaWiki( 'maintenance/commandLine.inc', getenv( 'MW_WIKI' )
?: 'testwiki' );
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 5549cf6..24df9b6 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -218,7 +218,8 @@
private function setSiteInfoForMaintenance() {
global $argv;
- $dbname = '';
+ $dbname = getenv( 'MW_WIKI' ) ?: '';
+
# The --wiki param must the second argument to to avoid
# any "options with args" ambiguity (see Maintenance.php).
if ( isset( $argv[1] ) && $argv[1] === '--wiki' ) {
--
To view, visit https://gerrit.wikimedia.org/r/293760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id432e25c02045065764e2515c971df234b76dc03
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@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
