Commit 8dfc4bd51ecdb5312e2344ca04be0a548f4c1f03
1 parent
80d63a36
Exists in
master
and in
1 other branch
new changes for deploy
Showing
2 changed files
with
9 additions
and
6 deletions
Show diff stats
config/deploy.rb
| @@ -8,7 +8,7 @@ set :puma_threads, [4, 16] | @@ -8,7 +8,7 @@ set :puma_threads, [4, 16] | ||
| 8 | set :puma_workers, 0 | 8 | set :puma_workers, 0 |
| 9 | 9 | ||
| 10 | # Default branch is :master | 10 | # Default branch is :master |
| 11 | -ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call | 11 | +# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call |
| 12 | 12 | ||
| 13 | # Don't change these unless you know what you're doing | 13 | # Don't change these unless you know what you're doing |
| 14 | set :pty, true | 14 | set :pty, true |
| @@ -28,14 +28,17 @@ set :puma_init_active_record, true # Change to false when not using ActiveRecor | @@ -28,14 +28,17 @@ set :puma_init_active_record, true # Change to false when not using ActiveRecor | ||
| 28 | 28 | ||
| 29 | ## Defaults: | 29 | ## Defaults: |
| 30 | # set :scm, :git | 30 | # set :scm, :git |
| 31 | -# set :branch, :master | 31 | +set :branch, :v2 |
| 32 | # set :format, :pretty | 32 | # set :format, :pretty |
| 33 | # set :log_level, :debug | 33 | # set :log_level, :debug |
| 34 | # set :keep_releases, 5 | 34 | # set :keep_releases, 5 |
| 35 | 35 | ||
| 36 | ## Linked Files & Directories (Default None): | 36 | ## Linked Files & Directories (Default None): |
| 37 | -# set :linked_files, %w{config/database.yml} | ||
| 38 | -# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system} | 37 | +# Default value for :linked_files is [] |
| 38 | +set :linked_files, %w{config/database.yml .env} | ||
| 39 | + | ||
| 40 | +# Default value for linked_dirs is [] | ||
| 41 | +set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system} | ||
| 39 | 42 | ||
| 40 | namespace :puma do | 43 | namespace :puma do |
| 41 | desc 'Create Directories for Puma Pids and Socket' | 44 | desc 'Create Directories for Puma Pids and Socket' |
| @@ -53,7 +56,7 @@ namespace :deploy do | @@ -53,7 +56,7 @@ namespace :deploy do | ||
| 53 | desc "Make sure local git is in sync with remote." | 56 | desc "Make sure local git is in sync with remote." |
| 54 | task :check_revision do | 57 | task :check_revision do |
| 55 | on roles(:app) do | 58 | on roles(:app) do |
| 56 | - unless `git rev-parse HEAD` == `git rev-parse origin/master` | 59 | + unless `git rev-parse HEAD` == `git rev-parse origin/v2` |
| 57 | puts "WARNING: HEAD is not the same as origin/master" | 60 | puts "WARNING: HEAD is not the same as origin/master" |
| 58 | puts "Run `git push` to sync changes." | 61 | puts "Run `git push` to sync changes." |
| 59 | exit | 62 | exit |
config/nginx.conf