Ori.livneh has submitted this change and it was merged.
Change subject: mwrepl improvements
......................................................................
mwrepl improvements
* Use undocumented '--debug-extension' feature to load MediaWiki without
requiring keyboard input.
* Use MWMinimalScriptInit from Id432e25c.
Change-Id: Ic5ed8f37821d250c7f08d1ea1f9d8d99a741f3ce
---
M modules/mediawiki/files/mwrepl
1 file changed, 10 insertions(+), 12 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
EBernhardson: Looks good to me, but someone else must approve
diff --git a/modules/mediawiki/files/mwrepl b/modules/mediawiki/files/mwrepl
index 625c4c2..04a3937 100755
--- a/modules/mediawiki/files/mwrepl
+++ b/modules/mediawiki/files/mwrepl
@@ -22,23 +22,21 @@
if [[ $# -gt 1 ]]; then
usage "Too many arguments"
elif [[ $# -eq 0 ]]; then
- WIKI=testwiki
+ MW_WIKI=testwiki
elif [ ${1:0:1} = "-" ]; then
usage "Unknown argument: $1"
else
- WIKI=$1
+ MW_WIKI=$1
fi
-if ! expanddblist all | grep "^${WIKI}\$" > /dev/null; then
- usage "Unknown wiki: $WIKI"
+if ! expanddblist all | grep "^${MW_WIKI}\$" > /dev/null; then
+ usage "Unknown wiki: $MW_WIKI"
fi
-if [ "$(whoami)" != "$MEDIAWIKI_WEB_USER" ] ; then
- HPHPD_INI="${HPHPD_INI_DIR:=/var/lib/hphpd}/$(whoami).hphpd.ini"
- if [ ! -f "$HPHPD_INI" ]; then
- sudo -u "$MEDIAWIKI_WEB_USER" cp "$HPHPD_INI_DIR/hphpd.ini"
"$HPHPD_INI"
- fi
- sudo -u "$MEDIAWIKI_WEB_USER" hhvm -a --debug-config "$HPHPD_INI"
"$MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE/multiversion/MWScript.php" commandLine.inc
"--wiki=$WIKI"
-else
- hhvm -a "$MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE/multiversion/MWScript.php"
commandLine.inc "--wiki=$WIKI"
+PROLOGUE="MW_WIKI=${MW_WIKI} MEDIAWIKI_WEB_USER=${MEDIAWIKI_WEB_USER}"
+
+if [[ $USER != $MEDIAWIKI_WEB_USER ]]; then
+ PROLOGUE="/usr/bin/sudo -u ${MEDIAWIKI_WEB_USER} ${PROLOGUE}"
fi
+
+$PROLOGUE /usr/bin/hhvm --mode=debug
--debug-extension="${MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE}/multiversion/MWMinimalScriptInit.php"
--
To view, visit https://gerrit.wikimedia.org/r/293795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5ed8f37821d250c7f08d1ea1f9d8d99a741f3ce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: EBernhardson <ebernhard...@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
