Remove ConfirmEdit if private wiki

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index c422b9c2f6d6e224d1e2c9b2a74ee8e8239690d4..e78ca3a25859b362f6744e1233aaf2d9569720a6 100644 (file)
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -199,12 +199,20 @@ action :create do
     update_site false
   end
 
     update_site false
   end
 

-  mediawiki_extension "ConfirmEdit" do
-    site new_resource.name
-    template "mw-ext-ConfirmEdit.inc.php.erb"
-    variables :public_key => new_resource.recaptcha_public_key,
-              :private_key => new_resource.recaptcha_private_key
-    update_site false
+  if new_resource.private_accounts || new_resource.private
+    mediawiki_extension "ConfirmEdit" do
+      site new_resource.name
+      update_site false
+      action :delete
+    end
+  else
+    mediawiki_extension "ConfirmEdit" do
+      site new_resource.name
+      template "mw-ext-ConfirmEdit.inc.php.erb"
+      variables :public_key => new_resource.recaptcha_public_key,
+                :private_key => new_resource.recaptcha_private_key
+      update_site false
+    end

   end
 
   mediawiki_extension "Gadgets" do
   end
 
   mediawiki_extension "Gadgets" do