mediawiki: enable QuickInstantCommons

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

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 976913cdef7c25aa444b60395e742ef8c6caa4fb..03f57faa62e2081d60948a2b01e687813d4c7962 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -508,11 +508,17 @@ action :create do
     update_site false
   end
 
-  # Broken Extension - 3 April 2022 - Remove. See https://github.com/openstreetmap/chef/pull/491#issuecomment-1086759504
-  mediawiki_extension "QuickInstantCommons" do
-    site new_resource.site
-    update_site false
-    action :delete
+  if new_resource.commons
+    mediawiki_extension "QuickInstantCommons" do
+      site new_resource.site
+      update_site false
+    end
+  else
+    mediawiki_extension "QuickInstantCommons" do
+      site new_resource.site
+      update_site false
+      action :delete
+    end
   end
 
   cookbook_file "#{site_directory}/cc-wiki.png" do
@@ -654,7 +660,6 @@ action_class do
 
   def mediawiki_params
     {
-      :site => => new_resource.site,
       :sitename => new_resource.sitename,
       :metanamespace => new_resource.metanamespace,
       :logo => new_resource.logo,