jenkins-bot has submitted this change and it was merged.
Change subject: Move Wikibase settings to own file
......................................................................
Move Wikibase settings to own file
This makes it easier to maintain Wikibase settings,
and is a step towards allowing different "experimental" config
on beta labs in advance of putting stuff in production.
Change-Id: I698ad7b457eb07301d65b83bcf9a9e24def60072
---
A docroot/noc/conf/Wikidata.php.txt
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/CommonSettings.php
A wmf-config/Wikibase.php
4 files changed, 136 insertions(+), 131 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/noc/conf/Wikidata.php.txt
b/docroot/noc/conf/Wikidata.php.txt
new file mode 120000
index 0000000..20780bf
--- /dev/null
+++ b/docroot/noc/conf/Wikidata.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/Wikidata.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 6cd1ebc..e0bb980 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -47,6 +47,7 @@
wmf-config/session.php
wmf-config/session-labs.php
wmf-config/twemproxy.yaml
+ wmf-config/Wikidata.php
)
# Create non-txt symlink from mediawiki-config
@@ -114,7 +115,7 @@
for i in ./*
do
- if [[ $i != "./index.php" && $i != "./highlight.php" && $i !=
"./images" ]]
+ if [[ $i != "./index.php" && $i != "./highlight.php" && $i !=
"./images" && $i != "./activeMWVersions.php" ]]
then
rm $i
fi
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 889f35e..d7b1dea 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2522,136 +2522,7 @@
}
if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
- require_once( "$IP/extensions/DataValues/DataValues.php" );
-
- // DataTypes is being moved out of the DataValues git repo.
- // this allows DataTypes in DataValues to be used if it exists, such as
older code.
- // if it is not found in DataValues, then load it below.
- //
- // For localisation update, there is an empty "dummy" branch of
DataTypes
- // so that localisation update can run okay.
- if ( !defined( 'DataTypes_VERSION' ) ) {
- require_once( "$IP/extensions/DataTypes/DataTypes.php" );
- }
-
- require_once( "$IP/extensions/Diff/Diff.php" );
- require_once( "$IP/extensions/WikibaseDataModel/WikibaseDataModel.php"
);
- require_once( "$IP/extensions/Wikibase/lib/WikibaseLib.php" );
-}
-
-if ( $wmgUseWikibaseRepo ) {
- require_once( "$IP/extensions/Wikibase/repo/Wikibase.php" );
-
- $baseNs = 120;
-
- // Define the namespace indexes
- define( 'WB_NS_PROPERTY', $baseNs );
- define( 'WB_NS_PROPERTY_TALK', $baseNs + 1 );
- define( 'WB_NS_QUERY', $baseNs + 2 );
- define( 'WB_NS_QUERY_TALK', $baseNs + 3 );
-
- // Define the namespaces
- $wgExtraNamespaces[WB_NS_PROPERTY] = 'Property';
- $wgExtraNamespaces[WB_NS_PROPERTY_TALK] = 'Property_talk';
- $wgExtraNamespaces[WB_NS_QUERY] = 'Query';
- $wgExtraNamespaces[WB_NS_QUERY_TALK] = 'Query_talk';
-
- $wgWBRepoSettings['dataSquidMaxage'] = 1 * 60 * 60;
- $wgWBRepoSettings['sharedCacheDuration'] = 60 * 60 * 24;
-
- // 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['normalizeItemByTitlePageNames'] = true;
-
- $wgWBRepoSettings['specialSiteLinkGroups'] = array( 'commons' );
-
- $wgWBRepoSettings['siteLinkGroups'] = array(
- 'wikipedia',
- 'wikivoyage',
- 'commons'
- );
-
- $wgWBRepoSettings['usePropertyInfoTable'] = true;
-
- if ( $wgDBname === 'testwikidatawiki' ) {
- // there is no cronjob dispatcher yet, this will do nothing
- $wgWBRepoSettings['clientDbList'] = array( 'test2wiki' );
- } else {
- $wgWBRepoSettings['clientDbList'] = array_map(
- 'trim',
- file( getRealmSpecificFilename(
"$IP/../wikidataclient.dblist" ) )
- );
- }
-
- $wgWBRepoSettings['localClientDatabases'] = array_combine(
- $wgWBRepoSettings['clientDbList'],
- $wgWBRepoSettings['clientDbList']
- );
-
- // Bug 51637 and 46953
- $wgGroupPermissions['*']['property-create'] = ( $wgDBname ===
'testwikidatawiki' );
-
- $wgWBRepoSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-$wmfExtendedVersionNumber";
-}
-
-if ( $wmgUseWikibaseClient ) {
- require_once( "$IP/extensions/Wikibase/client/WikibaseClient.php" );
-
- $wgWBClientSettings['changesDatabase'] = 'wikidatawiki';
- $wgWBClientSettings['repoDatabase'] = 'wikidatawiki';
-
- // to be safe, keeping this here although $wgDBname is default setting
- $wgWBClientSettings['siteGlobalID'] = $wgDBname;
- $wgWBClientSettings['repoUrl'] = "//{$wmfHostnames['wikidata']}";
-
- $wgWBClientSettings['repoNamespaces'] = array(
- 'wikibase-item' => '',
- 'wikibase-property' => 'Property'
- );
-
- $wgWBClientSettings['siteLinkGroups'] = array(
- 'wikipedia',
- 'wikivoyage',
- 'commons'
- );
-
- $wgWBClientSettings['withoutTermWeight'] = false;
- $wgWBClientSettings['usePropertyInfoTable'] = true;
- $wgWBClientSettings['sharedCacheDuration'] = 60 * 60 * 24;
- $wgWBClientSettings['enableSiteLinkWidget'] = true;
-
-
- if ( $wgDBname === 'commonswiki' ) {
- $wgWBClientSettings['languageLinkSiteGroup'] = 'wikipedia';
- $wgWBClientSettings['allowDataTransclusion'] = false;
-
- // per bug 54497, widget does not work yet for commons
- $wgWBClientSettings['enableSiteLinkWidget'] = false;
- }
-
- $wgWBClientSettings['siteGroup'] = $wmgWikibaseSiteGroup;
-
- $wgHooks['SetupAfterCache'][] = 'wmfWBClientExcludeNS';
-
- function wmfWBClientExcludeNS() {
- global $wgWBClientSettings;
-
- $wgWBClientSettings['excludeNamespaces'] = array_merge(
- MWNamespace::getTalkNamespaces(),
- array( NS_USER, NS_MEDIAWIKI )
- );
-
- return true;
- };
-
- foreach( $wmgWikibaseClientSettings as $setting => $value ) {
- $wgWBClientSettings[$setting] = $value;
- }
-
- $wgWBClientSettings['allowDataTransclusion'] = true;
- $wgWBClientSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-$wmfExtendedVersionNumber";
+ include( "$wmfConfigDir/Wikibase.php" );
}
if ( ( $wmgUseTranslate && $wmgUseTranslationMemory ) || $wmgEnableGeoData ) {
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
new file mode 100644
index 0000000..6e58964
--- /dev/null
+++ b/wmf-config/Wikibase.php
@@ -0,0 +1,132 @@
+<?php
+
+require_once( "$IP/extensions/DataValues/DataValues.php" );
+
+// DataTypes is being moved out of the DataValues git repo.
+// this allows DataTypes in DataValues to be used if it exists, such as older
code.
+// if it is not found in DataValues, then load it below.
+//
+// For localisation update, there is an empty "dummy" branch of DataTypes
+// so that localisation update can run okay.
+if ( !defined( 'DataTypes_VERSION' ) ) {
+ require_once( "$IP/extensions/DataTypes/DataTypes.php" );
+}
+
+require_once( "$IP/extensions/Diff/Diff.php" );
+require_once( "$IP/extensions/WikibaseDataModel/WikibaseDataModel.php" );
+require_once( "$IP/extensions/Wikibase/lib/WikibaseLib.php" );
+
+if ( $wmgUseWikibaseRepo ) {
+ require_once( "$IP/extensions/Wikibase/repo/Wikibase.php" );
+
+ $baseNs = 120;
+
+ // Define the namespace indexes
+ define( 'WB_NS_PROPERTY', $baseNs );
+ define( 'WB_NS_PROPERTY_TALK', $baseNs + 1 );
+ define( 'WB_NS_QUERY', $baseNs + 2 );
+ define( 'WB_NS_QUERY_TALK', $baseNs + 3 );
+
+ // Define the namespaces
+ $wgExtraNamespaces[WB_NS_PROPERTY] = 'Property';
+ $wgExtraNamespaces[WB_NS_PROPERTY_TALK] = 'Property_talk';
+ $wgExtraNamespaces[WB_NS_QUERY] = 'Query';
+ $wgExtraNamespaces[WB_NS_QUERY_TALK] = 'Query_talk';
+
+ $wgWBRepoSettings['dataSquidMaxage'] = 1 * 60 * 60;
+ $wgWBRepoSettings['sharedCacheDuration'] = 60 * 60 * 24;
+
+ // 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['normalizeItemByTitlePageNames'] = true;
+
+ $wgWBRepoSettings['specialSiteLinkGroups'] = array( 'commons' );
+
+ $wgWBRepoSettings['siteLinkGroups'] = array(
+ 'wikipedia',
+ 'wikivoyage',
+ 'commons'
+ );
+
+ $wgWBRepoSettings['usePropertyInfoTable'] = true;
+
+ if ( $wgDBname === 'testwikidatawiki' ) {
+ // there is no cronjob dispatcher yet, this will do nothing
+ $wgWBRepoSettings['clientDbList'] = array( 'test2wiki' );
+ } else {
+ $wgWBRepoSettings['clientDbList'] = array_map(
+ 'trim',
+ file( getRealmSpecificFilename(
"$IP/../wikidataclient.dblist" ) )
+ );
+ }
+
+ $wgWBRepoSettings['localClientDatabases'] = array_combine(
+ $wgWBRepoSettings['clientDbList'],
+ $wgWBRepoSettings['clientDbList']
+ );
+
+ // Bug 51637 and 46953
+ $wgGroupPermissions['*']['property-create'] = ( $wgDBname ===
'testwikidatawiki' );
+
+ $wgWBRepoSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-$wmfExtendedVersionNumber";
+}
+
+if ( $wmgUseWikibaseClient ) {
+ require_once( "$IP/extensions/Wikibase/client/WikibaseClient.php" );
+
+ $wgWBClientSettings['changesDatabase'] = 'wikidatawiki';
+ $wgWBClientSettings['repoDatabase'] = 'wikidatawiki';
+
+ // to be safe, keeping this here although $wgDBname is default setting
+ $wgWBClientSettings['siteGlobalID'] = $wgDBname;
+ $wgWBClientSettings['repoUrl'] = "//{$wmfHostnames['wikidata']}";
+
+ $wgWBClientSettings['repoNamespaces'] = array(
+ 'wikibase-item' => '',
+ 'wikibase-property' => 'Property'
+ );
+
+ $wgWBClientSettings['siteLinkGroups'] = array(
+ 'wikipedia',
+ 'wikivoyage',
+ 'commons'
+ );
+
+ $wgWBClientSettings['withoutTermWeight'] = false;
+ $wgWBClientSettings['usePropertyInfoTable'] = true;
+ $wgWBClientSettings['sharedCacheDuration'] = 60 * 60 * 24;
+ $wgWBClientSettings['enableSiteLinkWidget'] = true;
+
+
+ if ( $wgDBname === 'commonswiki' ) {
+ $wgWBClientSettings['languageLinkSiteGroup'] = 'wikipedia';
+ $wgWBClientSettings['allowDataTransclusion'] = false;
+
+ // per bug 54497, widget does not work yet for commons
+ $wgWBClientSettings['enableSiteLinkWidget'] = false;
+ }
+
+ $wgWBClientSettings['siteGroup'] = $wmgWikibaseSiteGroup;
+
+ $wgHooks['SetupAfterCache'][] = 'wmfWBClientExcludeNS';
+
+ function wmfWBClientExcludeNS() {
+ global $wgWBClientSettings;
+
+ $wgWBClientSettings['excludeNamespaces'] = array_merge(
+ MWNamespace::getTalkNamespaces(),
+ array( NS_USER, NS_MEDIAWIKI )
+ );
+
+ return true;
+ };
+
+ foreach( $wmgWikibaseClientSettings as $setting => $value ) {
+ $wgWBClientSettings[$setting] = $value;
+ }
+
+ $wgWBClientSettings['allowDataTransclusion'] = true;
+ $wgWBClientSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-$wmfExtendedVersionNumber";
+}
--
To view, visit https://gerrit.wikimedia.org/r/94069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I698ad7b457eb07301d65b83bcf9a9e24def60072
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
