diff --git a/CHANGELOG b/CHANGELOG index e458ab34..2cea08c7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* deploy:cold should also run migrations before starting the app [Jamis Buck] + * Make the copy strategy check out to a temporary directory [Jamis Buck] diff --git a/bin/capify b/bin/capify index 9486c640..650e56a0 100755 --- a/bin/capify +++ b/bin/capify @@ -26,6 +26,11 @@ files = { set :application, "set your application name here" set :repository, "set your repository location here" + # If you aren't deploying to /u/apps/\#{application} on the target + # servers (which is the default), you can specify the actual location + # via the :deploy_to variable: + # set :deploy_to, "/var/www/\#{application}" + # If you aren't using Subversion to manage your source code, specify # your SCM below: # set :scm, :subversion diff --git a/lib/capistrano/recipes/deploy.rb b/lib/capistrano/recipes/deploy.rb index 4eb04cd6..c38fdb77 100644 --- a/lib/capistrano/recipes/deploy.rb +++ b/lib/capistrano/recipes/deploy.rb @@ -244,11 +244,10 @@ namespace :deploy do deployed version of the app. However, you can specify a different release \ via the migrate_target variable, which must be one of :latest (for the \ default behavior), or :current (for the release indicated by the \ - `current' symlink). latest release to be deployed with the update_code \ - task). Strings will work for those values instead of symbols, too. You \ - can also specify additional environment variables to pass to rake via the \ - migrate_env variable. Finally, you can specify the full path to the rake \ - executable by setting the rake variable. The defaults are: + `current' symlink). Strings will work for those values instead of symbols, + too. You can also specify additional environment variables to pass to rake + via the migrate_env variable. Finally, you can specify the full path to the + rake executable by setting the rake variable. The defaults are: set :rake, "rake" set :rails_env, "production" @@ -347,12 +346,13 @@ namespace :deploy do desc <<-DESC Deploys and starts a `cold' application. This is useful if you have not \ deployed your application before, or if your application is (for some \ - other reason) not currently running. It will deploy the code, and then \ - instead of invoking `deploy:restart', it will invoke `deploy:app:start' \ - to fire up the application servers. + other reason) not currently running. It will deploy the code, run any \ + pending migrations, and then instead of invoking `deploy:restart', it will + invoke `deploy:app:start' to fire up the application servers. DESC task :cold do update + migrate app.start end