Commit 8ca041d411863af2fa931ea0a8635dfcda7f679b

Authored by Nathan Broadbent
2 parents 2eb1fea2 db02c9b8
Exists in master and in 1 other branch production

Merge pull request #443 from iFixit/deploy-fixed-branch

Capistrano: deploy from fixed branch
config/config.example.yml
@@ -66,6 +66,7 @@ deployment: @@ -66,6 +66,7 @@ deployment:
66 app: errbit.example.com 66 app: errbit.example.com
67 db: errbit.example.com 67 db: errbit.example.com
68 repository: http://github.com/errbit/errbit.git 68 repository: http://github.com/errbit/errbit.git
  69 + branch: master
69 user: deploy 70 user: deploy
70 deploy_to: /var/www/apps/errbit 71 deploy_to: /var/www/apps/errbit
71 # setup path to unicorn pids folder (or deploy_to/shared/pids will be used) 72 # setup path to unicorn pids folder (or deploy_to/shared/pids will be used)
config/deploy.example.rb
@@ -35,8 +35,7 @@ set :copy_compression, :bz2 @@ -35,8 +35,7 @@ set :copy_compression, :bz2
35 35
36 set :scm, :git 36 set :scm, :git
37 set :scm_verbose, true 37 set :scm_verbose, true
38 -set(:current_branch) { `git branch`.match(/\* (\S+)\s/m)[1] || raise("Couldn't determine current branch") }  
39 -set :branch, defer { current_branch } 38 +set :branch, config['branch'] || 'master'
40 39
41 before 'deploy:assets:symlink', 'errbit:symlink_configs' 40 before 'deploy:assets:symlink', 'errbit:symlink_configs'
42 # if unicorn is started through something like runit (the tool which restarts the process when it's stopped) 41 # if unicorn is started through something like runit (the tool which restarts the process when it's stopped)