Revert "mediawiki: use master branch for QuickInstantCommons extension"

[chef.git] / cookbooks / mediawiki / resources / site.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 0baa9527f8d473004c687d39d2adba19a9910063..c662bb8dfcec504373ffa8e1eaff1dbef8333666 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -452,7 +452,6 @@ action :create do
 
   mediawiki_extension "osmtaginfo" do
     site new_resource.site
-    template "mw-ext-osmtaginfo.inc.php.erb"
     repository "https://github.com/Firefishy/osmtaginfo.git"
     tag "live"
     update_site false
@@ -495,6 +494,7 @@ action :create do
   mediawiki_extension "VisualEditor" do
     site new_resource.site
     template "mw-ext-VisualEditor.inc.php.erb"
+    variables :version => new_resource.version
     update_site false
   end
 
@@ -503,6 +503,12 @@ action :create do
     update_site false
   end
 
+  mediawiki_extension "QuickInstantCommons" do
+    site new_resource.site
+    update_site false
+    only_if { new_resource.commons == true }
+  end
+
   cookbook_file "#{site_directory}/cc-wiki.png" do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]