From: Tom Hughes <tom@compton.nu>
Date: Tue, 18 Sep 2018 07:31:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/191'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/f02b9ff0a1cd8ec3fde0568a006e675c1c8544b8?hp=b8c99a872d60440e860eafa5e83797a0cde6e8ca

Merge remote-tracking branch 'github/pull/191'
---

diff --git a/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb b/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
index d4c2b975c..8767afd0b 100644
--- a/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
+++ b/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
@@ -81,9 +81,5 @@ $wgGroupPermissions['data-admin']['item-merge'] = true;
 $wgGroupPermissions['data-admin']['property-create'] = true;
 
 
-// ---- This should be set once formatUrl property is created
-// $wgWBRepoSettings['formatterUrlProperty'] = 'P3';
-
-// ---- This should be removed once all needed initial items and properties are set up
-$wgNamespaceProtection[WB_NS_ITEM] = [ 'create-wb-items' ];
-$wgGroupPermissions['data-admin']['create-wb-items'] = true;
+// See https://www.mediawiki.org/wiki/Wikibase/Installation/Advanced_configuration#Define_links_for_external_identifiers
+$wgWBRepoSettings['formatterUrlProperty'] = 'P8';