[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deploy ReadingLists to production

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395687 )

Change subject: Deploy ReadingLists to production
......................................................................

Deploy ReadingLists to production

Bug: T181107
Change-Id: I1a984e16d6e2017436b4c140cc3cea550ec1f767
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
6 files changed, 28 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/87/395687/1

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 4844d73..64619c9 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -340,13 +340,6 @@
        };
 }
 
-if ( $wmgUseReadingLists ) {
-       wfLoadExtension( 'ReadingLists' );
-       $wgReadingListsCentralWiki = 'metawiki';
-       // no clusters in Beta; let's just pick a random wiki DB and use that
-       $wgReadingListsDatabase = 'metawiki';
-}
-
 if ( $wmgUseLoginNotify ) {
        $wgLoginNotifyAttemptsKnownIP = 10;
        $wgLoginNotifyAttemptsNewIP = 1;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d806b58..f22043a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3638,6 +3638,10 @@
        $wg3dProcessor = [ '/usr/bin/xvfb-run', '-a', '-s', '-ac -screen 0 
1280x1024x24' ,'/srv/deployment/3d2png/deploy/src/3d2png.js' ];
 }
 
+if ( $wmgUseReadingLists ) {
+       wfLoadExtension( 'ReadingLists' );
+}
+
 if ( $wmfRealm === 'labs' ) {
        require "$wmfConfigDir/CommonSettings-labs.php";
 }
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 383c120..a94e15c 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -672,6 +672,15 @@
                'wmgUseReadingLists' => [
                        'default' => true,
                ],
+               'wgReadingListsCluster' => [
+                       'default' => false,
+               ],
+               'wgReadingListsDatabase' => [
+                       'default' => 'metawiki',
+               ],
+               'wgReadingListsCentralWiki' => [
+                       'default' => 'metawiki',
+               ],
 
                // TODO(T166759): Remove this setting once it is also
                // the default for production.
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 088a25e..863f3cc 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19910,6 +19910,20 @@
        'default' => MIGRATION_OLD,
 ],
 
+'wmgUseReadingLists' => [
+       'default' => true,
+       'private' => false,
+       'fishbowl' => false,
+       'nonglobal' => false,
+],
+'wgReadingListsCluster' => [
+       'default' => 'extension1',
+],
+'wgReadingListsDatabase' => [
+       'default' => 'wikishared',
+],
+'wgReadingListsCentralWiki' => [
+       'default' => 'metawiki',
 ];
 
 ### WMF Labs override #####
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 9a9c685..9a26554 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -113,6 +113,7 @@
 $IP/extensions/PoolCounter/extension.json
 $IP/extensions/QuickSurveys/extension.json
 $IP/extensions/Quiz/extension.json
+$IP/extensions/ReadingLists/extension.json
 $IP/extensions/RelatedArticles/extension.json
 $IP/extensions/RelatedSites/extension.json
 $IP/extensions/Renameuser/extension.json
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index f4fd45c..85139d2 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -2,6 +2,5 @@
 $IP/extensions/FileImporter/extension.json
 $IP/extensions/FileExporter/extension.json
 $IP/extensions/PerformanceInspector/extension.json
-$IP/extensions/ReadingLists/extension.json
 $IP/extensions/Sentry/extension.json
 

-- 
To view, visit https://gerrit.wikimedia.org/r/395687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a984e16d6e2017436b4c140cc3cea550ec1f767
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits