Convert ohai_plugin to an LWRP

[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 1d507c69dcd241d7b68f01d86abc2287c7601ef7..764a5983208da9ef9edf102591fb58b321e771c3 100644 (file)
--- a/cookbooks/mediawiki/definitions/mediawiki_extension.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_extension.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-define :mediawiki_extension, :action => [ :enable ], :variables => {} do
+define :mediawiki_extension, :action => [:enable], :variables => {} do

   name = params[:name]
   site = params[:site]
   mediawiki_directory = node[:mediawiki][:sites][site][:directory]
   name = params[:name]
   site = params[:site]
   mediawiki_directory = node[:mediawiki][:sites][site][:directory]


@@ -56,11 +56,11 @@ define :mediawiki_extension, :action => [ :enable ], :variables => {} do
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       ignore_failure repository.start_with?("git://github.com/wikimedia/mediawiki-extensions")
       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
 
     end
   end
 

-  if template
+  if template # ~FC023

     template "#{mediawiki_directory}/LocalSettings.d/Ext-#{name}.inc.php" do
       cookbook "mediawiki"
       source template
     template "#{mediawiki_directory}/LocalSettings.d/Ext-#{name}.inc.php" do
       cookbook "mediawiki"
       source template


@@ -68,7 +68,7 @@ define :mediawiki_extension, :action => [ :enable ], :variables => {} do
       group node[:mediawiki][:group]
       mode 0664
       variables template_variables
       group node[:mediawiki][:group]
       mode 0664
       variables template_variables

-      notifies :create, resources(:template => "#{mediawiki_directory}/LocalSettings.php")
+      notifies :create, "template[#{mediawiki_directory}/LocalSettings.php]"

     end
   end
 
     end
   end
 


@@ -79,6 +79,6 @@ define :mediawiki_extension, :action => [ :enable ], :variables => {} do
     mode 0664
     content "<?php require_once('#{extension_directory}/#{name}.php');\n"
     only_if { File.exist?("#{extension_directory}/#{name}.php") }
     mode 0664
     content "<?php require_once('#{extension_directory}/#{name}.php');\n"
     only_if { File.exist?("#{extension_directory}/#{name}.php") }

-    notifies :create, resources(:template => "#{mediawiki_directory}/LocalSettings.php")
+    notifies :create, "template[#{mediawiki_directory}/LocalSettings.php]"

   end
 end
   end
 end