[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Make using CirrusSearch engine default for wbsearchentities

2017-10-25 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379426 )

Change subject: Make using CirrusSearch engine default for wbsearchentities
..


Make using CirrusSearch engine default for wbsearchentities

Bug: T175741
Change-Id: I3641080d71886ca2b960442ced3d200e8f8b1bc0
---
M wmf-config/Wikibase.php
1 file changed, 2 insertions(+), 5 deletions(-)

Approvals:
  Niharika29: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 2da35e1..1478ee7 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -133,19 +133,16 @@
$wgCaptchaTriggersOnNamespace[NS_MAIN]['addurl'] = false;
$wgCaptchaTriggersOnNamespace[WB_NS_PROPERTY]['addurl'] = false;
if ( $wgDBname === 'testwikidatawiki' ) {
-   // Enable Cirrus on test.wikidata.org
-   $wgWBRepoSettings['entitySearch']['useCirrus'] = true;
// These are for testing only, one is Item and one is ExternalId
$wgWBRepoSettings['searchIndexProperties'] = [ 'P7', 'P700' ];
} else {
-   // Soft-enable Cirrus usage for wbsearchentities
-   // Cirrus search will be used if useCirrus=1 parameter is set
-   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
// Index: instance of, subclass of
$wgWBRepoSettings['searchIndexProperties'] = [ 'P31', 'P279' ];
}
 
$wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager';
+   // Cirrus usage for wbsearchentities is on
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = true;
 }
 
 if ( $wmgUseWikibaseClient ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3641080d71886ca2b960442ced3d200e8f8b1bc0
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Lydia Pintscher (WMDE) 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Make using CirrusSearch engine default for wbsearchentities ...

2017-09-27 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381025 )

Change subject: Make using CirrusSearch engine default for wbsearchentities on 
test.wikidata.org
..


Make using CirrusSearch engine default for wbsearchentities on test.wikidata.org

Bug: T175741
Change-Id: I3a610619efcdade470b330ce6cccd81a2c030619
---
M wmf-config/Wikibase.php
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Lydia Pintscher: Looks good to me, but someone else must approve
  Daniel Kinzler: Looks good to me, but someone else must approve
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index c97a157..4631797 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -132,9 +132,14 @@
// on either Item or Property pages. T86453
$wgCaptchaTriggersOnNamespace[NS_MAIN]['addurl'] = false;
$wgCaptchaTriggersOnNamespace[WB_NS_PROPERTY]['addurl'] = false;
-   // Soft-enable Cirrus usage for wbsearchentities
-   // Cirrus search will be used if useCirrus=1 parameter is set
-   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
+   if ( $wgDBname === 'testwikidatawiki' ) {
+   // Enable Cirrus on test.wikidata.org
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = true;
+   } else {
+   // Soft-enable Cirrus usage for wbsearchentities
+   // Cirrus search will be used if useCirrus=1 parameter is set
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
+   }
 }
 
 if ( $wmgUseWikibaseClient ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a610619efcdade470b330ce6cccd81a2c030619
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Lydia Pintscher (WMDE) 
Gerrit-Reviewer: Lydia Pintscher 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Make using CirrusSearch engine default for wbsearchentities ...

2017-09-27 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381025 )

Change subject: Make using CirrusSearch engine default for wbsearchentities on 
test.wikidata.org
..

Make using CirrusSearch engine default for wbsearchentities on test.wikidata.org

Bug: T175741
Change-Id: I3a610619efcdade470b330ce6cccd81a2c030619
---
M wmf-config/Wikibase.php
1 file changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index c97a157..4631797 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -132,9 +132,14 @@
// on either Item or Property pages. T86453
$wgCaptchaTriggersOnNamespace[NS_MAIN]['addurl'] = false;
$wgCaptchaTriggersOnNamespace[WB_NS_PROPERTY]['addurl'] = false;
-   // Soft-enable Cirrus usage for wbsearchentities
-   // Cirrus search will be used if useCirrus=1 parameter is set
-   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
+   if ( $wgDBname === 'testwikidatawiki' ) {
+   // Enable Cirrus on test.wikidata.org
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = true;
+   } else {
+   // Soft-enable Cirrus usage for wbsearchentities
+   // Cirrus search will be used if useCirrus=1 parameter is set
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
+   }
 }
 
 if ( $wmgUseWikibaseClient ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a610619efcdade470b330ce6cccd81a2c030619
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Make using CirrusSearch engine default for wbsearchentities

2017-09-20 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379426 )

Change subject: Make using CirrusSearch engine default for wbsearchentities
..

Make using CirrusSearch engine default for wbsearchentities

Bug: T175741
Change-Id: I3641080d71886ca2b960442ced3d200e8f8b1bc0
---
M wmf-config/Wikibase.php
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index c97a157..874e40f 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -132,9 +132,8 @@
// on either Item or Property pages. T86453
$wgCaptchaTriggersOnNamespace[NS_MAIN]['addurl'] = false;
$wgCaptchaTriggersOnNamespace[WB_NS_PROPERTY]['addurl'] = false;
-   // Soft-enable Cirrus usage for wbsearchentities
-   // Cirrus search will be used if useCirrus=1 parameter is set
-   $wgWBRepoSettings['entitySearch']['useCirrus'] = null;
+   // Cirrus usage for wbsearchentities is on
+   $wgWBRepoSettings['entitySearch']['useCirrus'] = true;
 }
 
 if ( $wmgUseWikibaseClient ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3641080d71886ca2b960442ced3d200e8f8b1bc0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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