Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74362
Change subject: Update and cleanup settings for Wikidata
......................................................................
Update and cleanup settings for Wikidata
* add settings to allow things to work until pending schema changes happen
* disable data transclusion for wikivoyage clients
* add wikivoyage to wikibase siteGroups
* add shared cache key settings
* explicitly require WikibaseDataModel
* re-add WikibaseDataModel to extensions-list (should be fine now, since
is used on all current deployment branches)
Change-Id: I61d9a9d5146af5b94f94820113ef69d38826e93f
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
3 files changed, 46 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/62/74362/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 909f56d..64bf70c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2462,10 +2462,17 @@
$wgULSIMEEnabled = $wmgULSIMEEnabled;
}
-if ( $wmgUseWikibaseRepo ) {
+if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
require_once( "$IP/extensions/DataValues/DataValues.php" );
require_once( "$IP/extensions/Diff/Diff.php" );
+ require_once( "$IP/extensions/WikibaseDataModel/WikibaseDataModel.php"
);
require_once( "$IP/extensions/Wikibase/lib/WikibaseLib.php" );
+
+ $wmgWikibaseCacheDuration = 60 * 60 * 24;
+ $wmgWikibaseCachePrefix = $wgDBname;
+}
+
+if ( $wmgUseWikibaseRepo ) {
require_once( "$IP/extensions/Wikibase/repo/Wikibase.php" );
$baseNs = 120;
@@ -2482,19 +2489,25 @@
$wgExtraNamespaces[WB_NS_QUERY] = 'Query';
$wgExtraNamespaces[WB_NS_QUERY_TALK] = 'Query_talk';
- $wgWBRepoSettings['changesAsJson'] = true;
-
$wgWBRepoSettings['dataSquidMaxage'] = 1 * 60 * 60;
+ $wgWBRepoSettings['sharedCacheDuration'] = $wmgWikibaseCacheDuration;
// Assigning the correct content models to the namespaces
$wgWBRepoSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_ITEM] =
NS_MAIN;
$wgWBRepoSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_PROPERTY]
= WB_NS_PROPERTY;
- $wgWBRepoSettings['idBlacklist'] = array( 1, 2, 3, 4, 5, 8, 13, 23, 24,
42, 80, 666, 1337, 1868, 1971, 2000, 2001, 2012, 2013 );
-
- $wgWBRepoSettings['withoutTermSearchKey'] = false;
+ $wgWBRepoSettings['idBlacklist'] = array( 1, 2, 3, 4, 5, 8, 13, 23, 24,
42, 80, 666,
+ 1337, 1868, 1971, 2000, 2001, 2012, 2013 );
$wgWBRepoSettings['normalizeItemByTitlePageNames'] = true;
+
+ $wgWBRepoSettings['siteLinkGroups'] = array(
+ 'wikipedia',
+ 'wikivoyage'
+ );
+
+ $wgWBRepoSettings['withoutTermWeight'] = true;
+ $wgWBRepoSettings['usePropertyInfoTable'] = false;
$wgWBRepoSettings['clientDbList'] = array_merge(
array( 'test2wiki' => 'test2wiki' ),
@@ -2507,12 +2520,15 @@
);
$wgGroupPermissions['*']['property-create'] = false;
+
+ foreach( $wmgWikibaseRepoSettings as $setting => $value ) {
+ $wgWBRepoSettings[$setting] = $value;
+ }
+
+ $wgWBRepoSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-$wmfExtendedVersionNumber";
}
if ( $wmgUseWikibaseClient ) {
- require_once( "$IP/extensions/DataValues/DataValues.php" );
- require_once( "$IP/extensions/Diff/Diff.php" );
- require_once( "$IP/extensions/Wikibase/lib/WikibaseLib.php" );
require_once( "$IP/extensions/Wikibase/client/WikibaseClient.php" );
$wgWBClientSettings['changesDatabase'] = 'wikidatawiki';
@@ -2527,9 +2543,14 @@
'wikibase-property' => 'Property'
);
- $wgWBClientSettings['allowDataTransclusion'] = true;
- $wgWBClientSettings['enableSiteLinkWidget'] = true;
- $wgWBClientSettings['propagateChangesToRepo'] = true;
+ $wgWBClientSettings['siteLinkGroups'] = array(
+ 'wikipedia',
+ 'wikivoyage'
+ );
+
+ $wgWBClientSettings['withoutTermWeight'] = true;
+ $wgWBClientSettings['usePropertyInfoTable'] = false;
+ $wgWBClientSettings['sharedCacheDuration'] = $wmgWikibaseCacheDuration;
$wgHooks['SetupAfterCache'][] = 'wmfWBClientExcludeNS';
@@ -2548,6 +2569,8 @@
$wgWBClientSettings[$setting] = $value;
}
+ $wgWBClientSettings['allowDataTransclusion'] =
$wmgWikibaseDataTransclusion;
+ $wgWBClientSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-$wmfExtendedVersionNumber";
}
if ( ( $wmgUseTranslate && $wmgUseTranslationMemory ) || $wmgEnableGeoData ) {
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 54e8a0a..2c9fa05 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12175,6 +12175,12 @@
'enwiki' => false,
),
+'wmgWikibaseCachePrefix' => array(
+ 'default' => 'wikidatawiki',
+ 'testwikidatawiki' => 'testwikidata',
+ 'test2wiki' => 'wikidatawiki-test2'
+),
+
'wmgUseWikibaseRepo' => array(
'default' => false,
'wikidata' => true,
@@ -12186,7 +12192,10 @@
'wikidataclient' => true,
),
-//it, he, hu, ru, tr, uk, uz, hr, bs, sr, sh
+'wmgWikibaseDataTransclusion' => array(
+ 'default' => true,
+ 'wikivoyage' => false
+),
'wmgWikibaseClientSettings' => array(
// @note because of unconventional way of doing wikibase settings, the
default setting
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index aae9d32..2c841d8 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -139,6 +139,7 @@
$IP/extensions/VipsScaler/VipsScaler.php
$IP/extensions/VipsScaler/VipsTest.php
$IP/extensions/VisualEditor/VisualEditor.php
+$IP/extensions/WikibaseDataModel/WikibaseDataModel.php
$IP/extensions/Wikibase/client/WikibaseClient.php
$IP/extensions/Wikibase/lib/WikibaseLib.php
$IP/extensions/Wikibase/repo/Wikibase.php
--
To view, visit https://gerrit.wikimedia.org/r/74362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61d9a9d5146af5b94f94820113ef69d38826e93f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
