PassengerUseGlobalQueue defaults to on with passenger 4

[chef.git] / cookbooks / apt / definitions / apt_source.rb

diff --git a/cookbooks/apt/definitions/apt_source.rb b/cookbooks/apt/definitions/apt_source.rb
index c109707a9cbb6ae8cff6f04c95625365db83b7ba..cc847a01e5ca688d47cf55fa15b5ee33dee613e1 100644 (file)
--- a/cookbooks/apt/definitions/apt_source.rb
+++ b/cookbooks/apt/definitions/apt_source.rb
@@ -18,12 +18,14 @@
 #
 
 define :apt_source do
 #
 
 define :apt_source do

-  if node.apt.sources.include?(params[:name])
+  if node[:apt][:sources].include?(params[:name])

     source_action = :create
 
     source_action = :create
 

-    execute "apt-key-#{params[:key]}" do
-      command "/usr/bin/apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys #{params[:key]}"
-      not_if "/usr/bin/apt-key list | /bin/fgrep -q #{params[:key]}"
+    if params[:key]
+      execute "apt-key-#{params[:key]}" do
+        command "/usr/bin/apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys #{params[:key]}"
+        not_if "/usr/bin/apt-key list | /bin/fgrep -q #{params[:key]}"
+      end

     end
   else
     source_action = :delete
     end
   else
     source_action = :delete


@@ -35,7 +37,7 @@ define :apt_source do
     owner "root"
     group "root"
     mode 0644
     owner "root"
     group "root"
     mode 0644

-    notifies :run, resources(:execute => "apt-update")
+    notifies :run, "execute[apt-update]"

     variables :url => params[:url]
   end
 end
     variables :url => params[:url]
   end
 end