Move some hardcoded angelbox app setup into railsframe

rjacoby · Jan 16, 2011 · 2296978 · 2296978
1 parent 5f02b54
commit 2296978
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/cookbooks/angelbox/recipes/default.rb b/cookbooks/angelbox/recipes/default.rb
@@ -25,7 +25,7 @@
   group "www"
 end
 
-# Outdated information sometimes means package won't install
+# Outdated information sometimes means packages won't install - update
 require_recipe "apt"
 
 # includes build-essential, for gems with native extensions
@@ -49,8 +49,6 @@
 package "libsqlite3-dev"
 ###########
 
-
-
 directory "/home/www/checkouts" do
   owner "www"
   group "www"

diff --git a/cookbooks/railsframe/recipes/default.rb b/cookbooks/railsframe/recipes/default.rb
@@ -18,9 +18,10 @@
     app[:name] ||= app[:github]
   end
 
+  project = app[:dir] || app[:name]
+  dir = "#{node[:railsframe][:dir]}/#{project}"
   if app[:git]
-    project = app[:dir] || app[:name]
-    git "#{node[:railsframe][:dir]}/#{project}" do
+    git dir do
       action :sync
       repository app[:git]
       user node[:railsframe][:user]
@@ -30,4 +31,19 @@
     raise "Couldn't find a git repository!"
   end
 
+  directory "#{dir}/tmp" do
+    owner node[:railsframe][:user]
+    group node[:railsframe][:group]
+  end
+
+  bash "bundler installation" do
+    code "bundle install"
+    cwd dir
+    only_if { File.exist? "#{dir}/Gemfile" }
+  end
+
+  bash "passenger restart" do
+    code "touch tmp/restart.txt"
+    cwd dir
+  end
 end