Merge branch 'master' of github.com:infochimps-labs/ironfan-pantry

infochimps-labs · Aug 2, 2012 · 8926d39 · 8926d39
2 parents 9e666af + 7d10cb3
commit 8926d39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cookbooks/nodejs/attributes/default.rb b/cookbooks/nodejs/attributes/default.rb
@@ -1,4 +1,5 @@
-default[:nodejs][:git_repo] = "https://github.com/joyent/node.git"
+default[:nodejs][:git_url]         = "https://github.com/joyent/node.git"
+default[:nodejs][:deploy_version]  = "master"
 default[:nodejs][:jobs] = "2"
 default[:nodejs][:install_dir] = "/usr/src/nodejs"
 default[:nodejs][:bin_path] = "/usr/local/bin/node"
diff --git a/cookbooks/nodejs/recipes/compile.rb b/cookbooks/nodejs/recipes/compile.rb
@@ -31,8 +31,8 @@
 #   creates "/usr/src/node"
 # end
 git "#{node[:nodejs][:install_dir]}" do
-  repository "#{node[:nodejs][:git_repo]}"
-  reference "master"
+  repository "#{node[:nodejs][:git_url]}"
+  reference "#{node[:nodejs][:deploy_version]}"
   action :sync
 end