jenkins-bot has submitted this change and it was merged.
Change subject: Use Debian-packaged texvc on Trusty app servers
......................................................................
Use Debian-packaged texvc on Trusty app servers
Follows I6de3aa31c.
Bug: 71224
Change-Id: I2d3e80db72c9a14991d2d0fabb0e7c5af2a360eb
---
M wmf-config/CommonSettings.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
Aaron Schulz: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 6b987bb..0483ad8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2132,7 +2132,11 @@
if ( $wmgUseMath ) {
require_once( "$IP/extensions/Math/Math.php" );
- $wgTexvc = "/usr/local/apache/uncommon/bin/texvc";
+
+ // Use the Debian-packaged texvc on Trusty. --Ori, 24-Sept-2014
+ $wgTexvc = defined( 'HHVM_VERSION' ) && $wmfRealm === 'production' ?
+ '/usr/bin/texvc' : '/usr/local/apache/uncommon/bin/texvc';
+
$wgMathTexvcCheckExecutable =
"/usr/local/apache/uncommon/bin/texvccheck";
if ( $wgDBname === 'hewiki' ) {
$wgDefaultUserOptions['math'] = 0;
--
To view, visit https://gerrit.wikimedia.org/r/162795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d3e80db72c9a14991d2d0fabb0e7c5af2a360eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
