Capistrano updated.

Conflicts: config/deploy/staging.rb
huerlisi · Aug 17, 2011 · c2298ed · c2298ed
1 parent 3c6c1dd
commit c2298ed
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 296 deletions.
diff --git a/Capfile b/Capfile
@@ -2,6 +2,6 @@ require 'bundler/setup'
 
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
 Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-Dir['lib/recipes/*.rb'].each { |plugin| load(plugin) }
+#Dir['lib/recipes/*.rb'].each { |plugin| load(plugin) }
 
 load 'config/deploy' # remove this line to skip loading any of the default tasks
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -1,3 +1,5 @@
+require 'cookbook/wikisigns'
+
 #Application
 set :application, "wikisigns"
 set :repository,  "git@github.com:huerlisi/wikisigns.git"
@@ -20,15 +22,4 @@
 set :copy_exclude, [".git", "spec"]
 
 
-# Passenger
-require 'cap_recipes/tasks/passenger'
-
-# Bundle install
-require "bundler/capistrano"
-after "bundle:install", "deploy:migrate"
-
-# Clean up the releases after deploy.
-after "deploy", "deploy:cleanup"
-
-require './config/boot'
 require 'hoptoad_notifier/capistrano'
diff --git a/lib/recipes/database.rb b/lib/recipes/database.rb
diff --git a/lib/recipes/new_relic.rb b/lib/recipes/new_relic.rb
diff --git a/lib/recipes/settings_logic.rb b/lib/recipes/settings_logic.rb
diff --git a/lib/recipes/sqlite.rb b/lib/recipes/sqlite.rb
diff --git a/lib/recipes/sync.rb b/lib/recipes/sync.rb