diff --git a/config/deploy.rb b/config/deploy.rb index 99939d8..d1e14bf 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -8,7 +8,7 @@ set :puma_threads, [4, 16] set :puma_workers, 0 # Default branch is :master -ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call +# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call # Don't change these unless you know what you're doing set :pty, true @@ -28,14 +28,17 @@ set :puma_init_active_record, true # Change to false when not using ActiveRecor ## Defaults: # set :scm, :git -# set :branch, :master +set :branch, :v2 # set :format, :pretty # set :log_level, :debug # set :keep_releases, 5 ## Linked Files & Directories (Default None): -# set :linked_files, %w{config/database.yml} -# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system} +# Default value for :linked_files is [] +set :linked_files, %w{config/database.yml .env} + +# Default value for linked_dirs is [] +set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system} namespace :puma do desc 'Create Directories for Puma Pids and Socket' @@ -53,7 +56,7 @@ namespace :deploy do desc "Make sure local git is in sync with remote." task :check_revision do on roles(:app) do - unless `git rev-parse HEAD` == `git rev-parse origin/master` + unless `git rev-parse HEAD` == `git rev-parse origin/v2` puts "WARNING: HEAD is not the same as origin/master" puts "Run `git push` to sync changes." exit diff --git a/config/nginx.conf b/config/nginx.conf index 169bbf3..33fc78b 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,6 +1,6 @@ upstream puma { - server unix:///home/deployer/apps/vlibras-web2/shared/tmp/sockets/appname-puma.sock; + server unix:///home/deployer/apps/vlibras-web2/shared/tmp/sockets/vlibras-web2-puma.sock; } server { -- libgit2 0.21.2