jenkins-bot has submitted this change and it was merged.
Change subject: Clean up VisualEditor config
......................................................................
Clean up VisualEditor config
* Pull list of VE-enabled wikis from visualeditor.dblist
* Set $wgVisualEditorParsoidPrefix to $wgDBname rather than a per-wiki value
** This requires a config change for Parsoid to recognize these prefixes
Bug: 47557
Change-Id: I621e98da3be4f787e294d97b350b92d217f43a00
---
A visualeditor.dblist
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 22 insertions(+), 44 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/visualeditor.dblist b/visualeditor.dblist
new file mode 100644
index 0000000..edfd446
--- /dev/null
+++ b/visualeditor.dblist
@@ -0,0 +1,19 @@
+testwiki
+test2wiki
+mediawikiwiki
+arwiki
+dewiki
+enwiki
+eswiki
+frwiki
+hewiki
+hiwiki
+itwiki
+jawiki
+kowiki
+nlwiki
+plwiki
+ruwiki
+svwiki
+viwiki
+zhwiki
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8980f90..d988f16 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -194,7 +194,7 @@
require( "$wmfConfigDir/InitialiseSettings.php" );
$wikiTags = array();
- foreach ( array( 'private', 'fishbowl', 'special', 'closed',
'flaggedrevs', 'small', 'medium', 'large', 'wikimania', 'wikidata',
'wikidataclient' ) as $tag ) {
+ foreach ( array( 'private', 'fishbowl', 'special', 'closed',
'flaggedrevs', 'small', 'medium', 'large', 'wikimania', 'wikidata',
'wikidataclient', 'visualeditor' ) as $tag ) {
$dblist = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../$tag.dblist" ) ) );
if ( in_array( $wgDBname, $dblist ) ) {
$wikiTags[] = $tag;
@@ -1884,7 +1884,7 @@
'eqiad' => '10.2.2.29', // parsoidcache.svc.eqiad.wmnet
);
$wgVisualEditorParsoidURL = 'http://' .
$wmgVisualEditorParsoidHosts[$wmfDatacenter] . ':6081';
- $wgVisualEditorParsoidPrefix = $wmgVisualEditorParsoidPrefix;
+ $wgVisualEditorParsoidPrefix = $wgDBname;
$wgVisualEditorParsoidProblemReportURL =
'http://parsoid.wmflabs.org/_bugs/';
$wgVisualEditorNamespaces = $wmgVisualEditorNamespaces;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index e055ad0..5e4c951 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10456,48 +10456,7 @@
'wmgUseVisualEditor' => array(
'default' => false,
- 'testwiki' => true,
- 'test2wiki' => true,
- 'mediawikiwiki' => true,
- 'arwiki' => true,
- 'dewiki' => true,
- 'enwiki' => true,
- 'eswiki' => true,
- 'frwiki' => true,
- 'hewiki' => true,
- 'hiwiki' => true,
- 'itwiki' => true,
- 'jawiki' => true,
- 'kowiki' => true,
- 'nlwiki' => true,
- 'plwiki' => true,
- 'ruwiki' => true,
- 'svwiki' => true,
- 'viwiki' => true,
- 'zhwiki' => true,
-),
-
-'wmgVisualEditorParsoidPrefix' => array(
- 'default' => '', // This MUST be configured per-wiki for VE to work
correctly
- 'testwiki' => 'test',
- 'test2wiki' => 'test2',
- 'mediawikiwiki' => 'mw',
- 'arwiki' => 'ar',
- 'dewiki' => 'de',
- 'enwiki' => 'en',
- 'eswiki' => 'es',
- 'frwiki' => 'fr',
- 'hewiki' => 'he',
- 'hiwiki' => 'hi',
- 'itwiki' => 'it',
- 'jawiki' => 'ja',
- 'kowiki' => 'ko',
- 'nlwiki' => 'nl',
- 'plwiki' => 'pl',
- 'ruwiki' => 'ru',
- 'svwiki' => 'sv',
- 'viwiki' => 'vi',
- 'zhwiki' => 'zh',
+ 'visualeditor' => true,
),
'wmgVisualEditorNamespaces' => array(
--
To view, visit https://gerrit.wikimedia.org/r/64493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I621e98da3be4f787e294d97b350b92d217f43a00
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: MZMcBride <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
