imagery: add blank diff cleanup to osstvw_make_diffs

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

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index f93306f56dd70a795ab8ccd6116617235cec2447..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


@@ -295,6 +303,7 @@ action :create do
 
   mediawiki_extension "cldr" do
     site new_resource.name
 
   mediawiki_extension "cldr" do
     site new_resource.name

+    template "mw-ext-cldr.inc.php.erb"

     tag mw_lang_ext_bundle_tag
     update_site false
   end
     tag mw_lang_ext_bundle_tag
     update_site false
   end


@@ -338,6 +347,7 @@ action :create do
 
   mediawiki_extension "AntiSpoof" do
     site new_resource.name
 
   mediawiki_extension "AntiSpoof" do
     site new_resource.name

+    template "mw-ext-AntiSpoof.inc.php.erb"

     update_site false
   end
 
     update_site false
   end
 


@@ -371,26 +381,26 @@ action :create do
 
   mediawiki_extension "osmtaginfo" do
     site new_resource.name
 
   mediawiki_extension "osmtaginfo" do
     site new_resource.name

+    template "mw-ext-osmtaginfo.inc.php.erb"

     repository "git://github.com/Firefishy/osmtaginfo.git"
     tag "live"
     update_site false
     repository "git://github.com/Firefishy/osmtaginfo.git"
     tag "live"
     update_site false

-    action :delete

   end
 
   mediawiki_extension "SimpleMap" do
     site new_resource.name
   end
 
   mediawiki_extension "SimpleMap" do
     site new_resource.name

+    template "mw-ext-SimpleMap.inc.php.erb"

     repository "git://github.com/Firefishy/SimpleMap.git"
     tag "live"
     update_site false
     repository "git://github.com/Firefishy/SimpleMap.git"
     tag "live"
     update_site false

-    action :delete

   end
 
   mediawiki_extension "SlippyMap" do
     site new_resource.name
   end
 
   mediawiki_extension "SlippyMap" do
     site new_resource.name

+    template "mw-ext-SlippyMap.inc.php.erb"

     repository "git://github.com/Firefishy/SlippyMap.git"
     tag "live"
     update_site false
     repository "git://github.com/Firefishy/SlippyMap.git"
     tag "live"
     update_site false

-    action :delete

   end
 
   mediawiki_extension "Mantle" do
   end
 
   mediawiki_extension "Mantle" do


@@ -411,6 +421,12 @@ action :create do
     update_site false
   end
 
     update_site false
   end
 

+  mediawiki_extension "VisualEditor" do
+    site new_resource.name
+    template "mw-ext-VisualEditor.inc.php.erb"
+    update_site false
+  end
+

   cookbook_file "#{site_directory}/cc-wiki.png" do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
   cookbook_file "#{site_directory}/cc-wiki.png" do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]