jenkins-bot has submitted this change and it was merged.
Change subject: Re-enable Parsoid on private wikis
......................................................................
Re-enable Parsoid on private wikis
The Parsoid PHP extension is now needed by VisualEditor to run, so the
special case "efficiency" of not loading Parsoid for private wikis no
longer works. The Parsoid extension already stops itself from inserting
private entries into the Varnish cache so this is not an issue.
Change-Id: I5265c408443212536a5ed96d910caba50c22e767
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 5 insertions(+), 9 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ac416aa..8b1a4ea 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1847,17 +1847,14 @@
$wgVectorBetaPersonalBar = $wmgVectorBetaPersonalBar;
}
-if ( $wmgUseParsoid || $wmgUseVisualEditor ) {
- // Needs to be set separately because some private wikis
- // use VE but not Parsoid.
- $wmgParsoidURL = 'http://10.2.2.29'; // parsoidcache.svc.eqiad.wmnet
- // The wiki prefix to use
- $wgParsoidWikiPrefix = $wgDBname;
-}
-
if ( $wmgUseParsoid ) {
require_once( "$IP/extensions/Parsoid/php/Parsoid.php" );
+ $wmgParsoidURL = 'http://10.2.2.29'; // parsoidcache.svc.eqiad.wmnet
+
+ // The wiki prefix to use
+ $wgParsoidWikiPrefix = $wgDBname;
+
// List the parsoid cache servers to keep up to date.
//
// We target the load balancer in front of the front-end caches, which
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index bde74c8..3edfbb8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10816,7 +10816,6 @@
'wmgUseParsoid' => array(
'default' => true,
- 'private' => false,
),
'wmgUseVisualEditor' => array(
--
To view, visit https://gerrit.wikimedia.org/r/132487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5265c408443212536a5ed96d910caba50c22e767
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
