[MediaWiki-commits] [Gerrit] [WIP] Deploy BounceHandler extension to production - change (operations/mediawiki-config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172322

Change subject: [WIP] Deploy BounceHandler extension to production
......................................................................

[WIP] Deploy BounceHandler extension to production

TODO:
* What is the extension table name?
* Set the secret in PrivateSettings.php
* Determine which IPs should be whitelisted

Bug: 69019
Change-Id: I2a5f118ae2a651040c43275d269bfe6114fb971c
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 22 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index d25a098..eea6664 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -123,10 +123,13 @@
        );
 }
 
-// BounceHandler
-require_once( "$IP/extensions/BounceHandler/BounceHandler.php" );
-//$wgVERPsecret = ''; // This was set in PrivateSettings.php by Legoktm
-$wgBounceHandlerUnconfirmUsers = false;
+// Labs override for BounceHandler
+if ( $wmgUseBounceHandler ) {
+       //$wgVERPsecret = ''; // This was set in PrivateSettings.php by Legoktm
+       $wgBounceHandlerCluster = false;
+       $wgBounceHandlerSharedDB = false;
+       $wgBounceHandlerInternalIPs = array( '127.0.0.1', '::1' );
+}
 
 if ( $wmgUseTimedMediaHandler ) {
        $wgMwEmbedModuleConfig[ 'MediaWiki.ApiProviders' ] =  array(
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 34b0983..fb1404a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2188,6 +2188,15 @@
        $wgBabelUseUserLanguage = $wmgBabelUseUserLanguage;
 }
 
+if ( $wmgUseBounceHandler ) {
+       // $wgVERPsecret is set in PrivateSettings.php
+       require_once "$IP/extensions/BounceHandler/BounceHandler.php";
+       $wgBounceHandlerUnconfirmUsers = false;
+       $wgBounceHandlerCluster = 'extension1';
+       $wgBounceHandlerSharedDB = '???';
+       $wgBounceHandlerInternalIPs = array( '???' );
+}
+
 if ( $wmgUseTranslate ) {
        require_once( "$IP/extensions/Translate/Translate.php" );
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4f305d8..b92b813 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12933,6 +12933,12 @@
        'wikidata' => true,
 ),
 
+'wmgUseBounceHandler' => array(
+       'default' => true,
+       'private' => false,
+       'fishbowl' => false,
+),
+
 'wmgUseTranslate' => array(
        'default' => false,
        'bewikimedia' => true, // bug 37391

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a5f118ae2a651040c43275d269bfe6114fb971c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>

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