MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/135088
Change subject: Kill all vestiges of GeoData's Solr support
......................................................................
Kill all vestiges of GeoData's Solr support
Change-Id: Iea1fccae82c3c3f310299529624518149441e215
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
4 files changed, 9 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/88/135088/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index e2bff21..01180b1 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -54,13 +54,6 @@
// So that people can easily test the captchas without making accounts --
Platonides
$wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
-if ( $wmgEnableGeoData ) {
- $wgGeoDataSolrMaster = "deployment-solr.{$wmfDatacenter}.wmflabs";
- $wgGeoDataSolrHosts = array(
- "deployment-solr.{$wmfDatacenter}.wmflabs" => 100,
- );
-}
-
// the beta cluster uses a different filebackend than production
if ( $wmgUseGWToolset ) {
$wgGWTFileBackend = 'gwtoolset-backend';
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ab40ca8..2ec98b2 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1476,9 +1476,9 @@
$wgNoticeCookieShortExpiry = 1209600; // 2 weeks
$wgNoticeCookieLongExpiry = 25920000; // 10 months
- // Bug 16821
- // Updates made here also need to be reflected in
- // wikimediafoundation.org/wiki/Template:HideBanners
+ // Bug 16821
+ // Updates made here also need to be reflected in
+ // wikimediafoundation.org/wiki/Template:HideBanners
$wgNoticeHideUrls = array(
'//en.wikipedia.org/wiki/Special:HideBanners',
'//meta.wikimedia.org/wiki/Special:HideBanners',
@@ -2264,24 +2264,14 @@
$wgWikimediaShopLinkTarget = '//shop.wikimedia.org';
}
-if ( $wmgEnableGeoData ) {
+if ( $wmgEnableGeoData
+ && ( $wmgUseCirrus || $wmgUseCirrusAsAlternative ) )
+{
require_once( "$IP/extensions/GeoData/GeoData.php" );
- if ( $wmgUseCirrus || $wmgUseCirrusAsAlternative ) {
- $wgGeoDataBackend = $wmgGeoDataBackend;
- $wgGeoDataUseCirrusSearch = $wmgGeoDataUseCirrusSearch;
- } else {
- $wgGeoDataBackend = 'solr';
- }
- $wgGeoDataSolrMaster = 'solr1001.eqiad.wmnet';
- $wgGeoDataSolrHosts = array(
- 'solr1001.eqiad.wmnet' => 75, // master, put less read load on
it
- 'solr1002.eqiad.wmnet' => 100,
- 'solr1003.eqiad.wmnet' => 100,
- );
+ $wgGeoDataBackend = 'elastic';
# Data collection mode
if ( !$wmgEnableGeoSearch ) {
- $wgAPIGeneratorModules['geosearch'] = 'ApiQueryDisabled';
$wgAPIListModules['geosearch'] = 'ApiQueryDisabled';
}
@@ -2291,7 +2281,6 @@
unset( $wgAPIListModules['geopagesincategory'] );
}
$wgMaxCoordinatesPerPage = 2000;
- $wgGeoDataSolrCommitPolicy = 'never';
$wgMaxGeoSearchRadius = $wmgMaxGeoSearchRadius;
$wgGeoDataDebug = $wmgGeoDataDebug;
}
@@ -2547,7 +2536,7 @@
// put this here to ensure it is available for localisation cache rebuild
$wgWBClientSettings['repoSiteName'] = 'wikibase-repo-name';
-if ( ( $wmgUseTranslate && $wmgUseTranslationMemory ) || $wmgEnableGeoData ) {
+if ( $wmgUseTranslate && $wmgUseTranslationMemory ) {
require_once( "$IP/extensions/Solarium/Solarium.php" );
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index d566139..7f50b40 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -230,15 +230,6 @@
'default' => true,
),
- 'wmgEnableGeoData' => array(
- 'default' => true,
- ),
- 'wmgGeoDataBackend' => array(
- 'default' => 'elastic',
- ),
- 'wmgGeoDataUseCirrusSearch' => array(
- 'default' => true,
- ),
'wmgGeoDataDebug' => array(
'default' => true,
),
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 451b104..1105efb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4016,7 +4016,6 @@
'CentralAuth' => "udp://$wmfUdp2logDest/centralauth", //
-pgehres 2013/05/09, tmp for SUL finalization
'GettingStarted' => "udp://$wmfUdp2logDest/gettingstarted",
'zero' => "udp://$wmfUdp2logDest/zero", // zero-rated debug log
- 'geodata' => "udp://$wmfUdp2logDest/geodata",
'DBPerformance' => "udp://$wmfUdp2logDest/dbperformance",
'CirrusSearch' => "udp://$wmfUdp2logDest/CirrusSearch",
'CirrusSearchChangeFailed' =>
"udp://$wmfUdp2logDest/CirrusSearch-failed",
@@ -4128,7 +4127,7 @@
'chapcomwiki' => array(
100 => 'Draft', // bug 64123
101 => 'Draft_talk',
- ),
+ ),
'mediawikiwiki' => array(
100 => 'Manual',
101 => 'Manual_talk',
@@ -12464,12 +12463,6 @@
'default' => false,
'wiki' => true,
'wikivoyage' => true,
-),
-'wmgGeoDataBackend' => array(
- 'default' => 'elastic',
-),
-'wmgGeoDataUseCirrusSearch' => array(
- 'default' => true,
),
'wmgEnableGeoSearch' => array(
'default' => true,
--
To view, visit https://gerrit.wikimedia.org/r/135088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea1fccae82c3c3f310299529624518149441e215
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
