Upgrade everything except ridley and ouroboros to chef 12

[chef.git] / cookbooks / mediawiki / definitions / mediawiki_extension.rb

diff --git a/cookbooks/mediawiki/definitions/mediawiki_extension.rb b/cookbooks/mediawiki/definitions/mediawiki_extension.rb
index 91c3116569da10c75680ee07ad49288d4172cce1..764a5983208da9ef9edf102591fb58b321e771c3 100644 (file)
--- a/cookbooks/mediawiki/definitions/mediawiki_extension.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_extension.rb
@@ -17,14 +17,14 @@
 # limitations under the License.
 #
 
-define :mediawiki_extension, :action => [ :enable ] do
+define :mediawiki_extension, :action => [:enable], :variables => {} do
   name = params[:name]
   site = params[:site]
-  site_directory = node[:mediawiki][:sites][site][:site_directory]
   mediawiki_directory = node[:mediawiki][:sites][site][:directory]
   extension_directory = "#{mediawiki_directory}/extensions/#{name}"
   source = params[:source]
   template = params[:template]
+  template_variables = params[:variables]
 
   if source
     remote_directory extension_directory do
@@ -51,23 +51,24 @@ define :mediawiki_extension, :action => [ :enable ] do
       action :sync
       repository repository
       reference reference
-      #depth 1
+      # depth 1
       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       ignore_failure repository.start_with?("git://github.com/wikimedia/mediawiki-extensions")
-      notifies :run, resources(:execute => "#{mediawiki_directory}/maintenance/update.php")
+      notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
     end
   end
 
-  if template
+  if template # ~FC023
     template "#{mediawiki_directory}/LocalSettings.d/Ext-#{name}.inc.php" do
       cookbook "mediawiki"
       source template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0664
-      notifies :create, resources(:template => "#{mediawiki_directory}/LocalSettings.php")
+      variables template_variables
+      notifies :create, "template[#{mediawiki_directory}/LocalSettings.php]"
     end
   end
 
@@ -77,7 +78,7 @@ define :mediawiki_extension, :action => [ :enable ] do
     group node[:mediawiki][:group]
     mode 0664
     content "<?php require_once('#{extension_directory}/#{name}.php');\n"
-    only_if do File.exist?("#{extension_directory}/#{name}.php") end
-    notifies :create, resources(:template => "#{mediawiki_directory}/LocalSettings.php")  
+    only_if { File.exist?("#{extension_directory}/#{name}.php") }
+    notifies :create, "template[#{mediawiki_directory}/LocalSettings.php]"
   end
 end