Remove trailing whitespace in ruby code

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

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

   name = params[:name]
   site = params[:site]
   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]
   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
 
   if source
     remote_directory extension_directory do


@@ -67,6 +67,7 @@ define :mediawiki_extension, :action => [ :enable ] do
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0664
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0664

+      variables template_variables

       notifies :create, resources(:template => "#{mediawiki_directory}/LocalSettings.php")
     end
   end
       notifies :create, resources(:template => "#{mediawiki_directory}/LocalSettings.php")
     end
   end


@@ -78,6 +79,6 @@ define :mediawiki_extension, :action => [ :enable ] do
     mode 0664
     content "<?php require_once('#{extension_directory}/#{name}.php');\n"
     only_if do File.exist?("#{extension_directory}/#{name}.php") end
     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")  
+    notifies :create, resources(:template => "#{mediawiki_directory}/LocalSettings.php")

   end
 end
   end
 end