MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/60325
Change subject: Enable GeoData in Labs ...................................................................... Enable GeoData in Labs Change-Id: Id65b4b082bc678c29da1419fad21e1c066d741f0 --- M wmf-config/CommonSettings-labs.php M wmf-config/InitialiseSettings-labs.php 2 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/25/60325/1 diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index d06ac30..da70101 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -47,6 +47,29 @@ // So that people can easily test the captchas without making accounts -- Platonides $wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false; +if ( $wmgEnableGeoData ) { + require_once( "$IP/extensions/GeoData/GeoData.php" ); + $wgGeoDataBackend = 'solr'; + $wgGeoDataSolrMaster = 'deployment-solr.pmtpa.wmflabs'; + $wgGeoDataSolrHosts = array( + 'deployment-solr.pmtpa.wmflabs' => 100, + ); + + # Data collection mode + if ( !$wmgEnableGeoSearch ) { + $wgAPIGeneratorModules['geosearch'] = 'ApiQueryDisabled'; + $wgAPIListModules['geosearch'] = 'ApiQueryDisabled'; + } + + # These modules have been intentionally disabled for the first phase of deployment + if ( $wgDBname !== 'testwiki' ) { + unset( $wgAPIListModules['geopages'] ); + unset( $wgAPIListModules['geopagesincategory'] ); + } + $wgMaxCoordinatesPerPage = 2000; +} + + # temporary extensions # ======================================================================== diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index d741b89..952f807 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -231,6 +231,12 @@ '-wmgUseWikibaseClient' => array( 'default' => false, ), + + 'wmgEnableGeoData' => array( + 'default' => false, + 'wiki' => true, + 'wikivoyage' => true, + ), ); } # wmflLabsSettings() -- To view, visit https://gerrit.wikimedia.org/r/60325 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id65b4b082bc678c29da1419fad21e1c066d741f0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem <maxsem.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits