Fixing solo support, updating solo based features

2 files changed, 3 insertions, 2 deletions

diff --git a/chef/lib/chef/application/solo.rb b/chef/lib/chef/application/solo.rb
index 59f529a6b7..1385f0c95e 100644
--- a/chef/lib/chef/application/solo.rb
+++ b/chef/lib/chef/application/solo.rb
@@ -96,7 +96,7 @@ class Chef::Application::Solo < Chef::Application
       end
     end
     
-    if Chef::Config[:recipes]
+    if Chef::Config[:recipe_url]
       cookbooks_path = Chef::Config[:cookbook_path].detect{|e| e =~ /\/cookbooks\/*$/ }
       recipes_path = File.expand_path(File.join(cookbooks_path, '..'))
       require 'net/http'
@@ -106,7 +106,7 @@ class Chef::Application::Solo < Chef::Application
       FileUtils.mkdir_p recipes_path
       path = File.join(recipes_path, 'recipes.tgz')
       File.open(path, 'wb') do |f|
-        f.write open(config[:recipes]).read
+        f.write open(config[:recipe_url]).read
       end
       Chef::Mixin::Command.run_command(:command => "cd #{recipes_path} && tar xzvf #{path}")
     end
diff --git a/chef/lib/chef/config.rb b/chef/lib/chef/config.rb
index 4592f3917c..95c59c011e 100644
--- a/chef/lib/chef/config.rb
+++ b/chef/lib/chef/config.rb
@@ -99,5 +99,6 @@ class Chef
     validation_token nil
     role_path "/var/chef/roles"
     role_url "http://localhost:4000"
+    recipe_url nil
   end
 end