Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/61975
Change subject: (bug 47610) Update Wikidata test settings to use $wgWBClientSettings and $wgWBRepoSettings ...................................................................... (bug 47610) Update Wikidata test settings to use $wgWBClientSettings and $wgWBRepoSettings * note: for settings defined in WikibaseLib, the variable stays the same: $wgWBSettings Change-Id: If49b303890fa39a55e6fe3a9950ed5456f2bbbc3 --- M modules/wikidata_singlenode/templates/wikidata-client-requires.php M modules/wikidata_singlenode/templates/wikidata-repo-requires.php 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/61975/1 diff --git a/modules/wikidata_singlenode/templates/wikidata-client-requires.php b/modules/wikidata_singlenode/templates/wikidata-client-requires.php index ece0b0a..de68998 100644 --- a/modules/wikidata_singlenode/templates/wikidata-client-requires.php +++ b/modules/wikidata_singlenode/templates/wikidata-client-requires.php @@ -36,19 +36,19 @@ $wgShowExceptionDetails = true; // information about the repo this client is connected to -$wgWBSettings['repoArticlePath'] = "/wiki/$1"; -$wgWBSettings['repoScriptPath'] = "/w"; +$wgWBClientSettings['repoArticlePath'] = "/wiki/$1"; +$wgWBClientSettings['repoScriptPath'] = "/w"; // The global site ID by which this wiki is known on the repo. -$wgWBSettings['siteGlobalID'] = "<%=siteGlobalID%>"; +$wgWBClientSettings['siteGlobalID'] = "<%=siteGlobalID%>"; // Database name of the repository, for the propagation of changes. // This requires the given database name to be known to LBFactory, see // $wgLBFactoryConf below. $wgWBSettings['changesDatabase'] = "repo"; -$wgWBSettings['repoDatabase'] = "repo"; -$wgWBSettings['repoNamespaces'] = array( 'wikibase-item' => 'Item', 'wikibase-property' => 'Property' ); +$wgWBClientSettings['repoDatabase'] = "repo"; +$wgWBClientSettings['repoNamespaces'] = array( 'wikibase-item' => 'Item', 'wikibase-property' => 'Property' ); -$wgWBSettings['repoUrl'] = "<%=repo_url%>"; +$wgWBClientSettings['repoUrl'] = "<%=repo_url%>"; //Load Balancer $wgLBFactoryConf = array( @@ -203,7 +203,7 @@ require_once( "$IP/extensions/TorBlock/TorBlock.php" ); require_once( "$IP/extensions/UserDailyContribs/UserDailyContribs.php" ); require_once( "$IP/extensions/UserMerge/UserMerge.php" ); -$wgGroupPermissions['sysop']['usermerge'] = true; +$wgGroupPermissions['sysop']['usermerge'] = true; $wgUserMergeProtectedGroups = array( 'sysop' ); require_once( "$IP/extensions/Vector/Vector.php" ); diff --git a/modules/wikidata_singlenode/templates/wikidata-repo-requires.php b/modules/wikidata_singlenode/templates/wikidata-repo-requires.php index d12c964..6de5d6d 100644 --- a/modules/wikidata_singlenode/templates/wikidata-repo-requires.php +++ b/modules/wikidata_singlenode/templates/wikidata-repo-requires.php @@ -71,9 +71,9 @@ $wgExtraNamespaces[WB_NS_QUERY_TALK] = 'Query_talk'; // Tell Wikibase which namespace to use for which kind of entity -$wgWBSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_ITEM] = NS_MAIN; // <=== Use main namespace for items!!! -$wgWBSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_PROPERTY] = WB_NS_PROPERTY; // use custom namespace -$wgWBSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_QUERY] = WB_NS_QUERY; // use custom namespace +$wgWBRepoSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_ITEM] = NS_MAIN; // <=== Use main namespace for items!!! +$wgWBRepoSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_PROPERTY] = WB_NS_PROPERTY; // use custom namespace +$wgWBRepoSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_QUERY] = WB_NS_QUERY; // use custom namespace $wgShowExceptionDetails = true; -- To view, visit https://gerrit.wikimedia.org/r/61975 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If49b303890fa39a55e6fe3a9950ed5456f2bbbc3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Aude <aude.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
