Ensure wikibase uses the correct repository URL

diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index 6240f6e87d008c1624d5497c6f2da6595499af61..fea8614d2e575494cbc3d084c4c8f920ffb73974 100644 (file)
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -74,7 +74,7 @@ action :create do
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode "664"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode "664"

-      variables new_resource.variables
+      variables new_resource.variables.merge(:site => new_resource.site)

     end
   else
     file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do
     end
   else
     file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do

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 6f7e8d6ebb7a22e75531ebd1d694dd32e45e922c..d609a3d57d2d6da35d9b7fdfccabd66e207bbec9 100644 (file)
--- a/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
+++ b/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
@@ -89,7 +89,7 @@ $wgWBClientSettings['showExternalRecentChanges'] = true;
 // Base URL for building links to the repository.
 // Assumes your wiki is setup as "http://repo.example.org/wiki/"
 // This can be protocol relative, such as "//www.wikidata.org"
 // Base URL for building links to the repository.
 // Assumes your wiki is setup as "http://repo.example.org/wiki/"
 // This can be protocol relative, such as "//www.wikidata.org"

-$wgWBClientSettings['repoUrl'] = "https://wiki.openstreetmap.org";
+$wgWBClientSettings['repoUrl'] = "https://<%= @site %>";

 
 // This setting is optional if you have the same type of setup for your
 // repo and client.  It will default to using the client's $wgArticlePath setting,
 
 // This setting is optional if you have the same type of setup for your
 // repo and client.  It will default to using the client's $wgArticlePath setting,