From 1f4f70b4a9d06c1c4603fc5e200506d422dc2f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 12 Nov 2019 18:09:16 +0100 Subject: [PATCH] Remove redundant stage settings These files are only loaded when the stage already has the value set inside them, so we don't need to set it again. On the other hand, the `rails_env` setting is configured in the `config/deploy.rb` file. --- config/deploy/preproduction.rb | 2 -- config/deploy/production.rb | 2 -- config/deploy/staging.rb | 2 -- 3 files changed, 6 deletions(-) diff --git a/config/deploy/preproduction.rb b/config/deploy/preproduction.rb index f7b2ade9f..1d282d1cf 100644 --- a/config/deploy/preproduction.rb +++ b/config/deploy/preproduction.rb @@ -3,8 +3,6 @@ set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) set :branch, ENV["branch"] || :master set :ssh_options, port: deploysecret(:ssh_port) -set :stage, :preproduction -set :rails_env, :preproduction server deploysecret(:server1), user: deploysecret(:user), roles: %w[web app db importer cron background] server deploysecret(:server2), user: deploysecret(:user), roles: %w[web app db importer] diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 6f1524a8c..c9fc15c3c 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -3,8 +3,6 @@ set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) set :branch, :master set :ssh_options, port: deploysecret(:ssh_port) -set :stage, :production -set :rails_env, :production server deploysecret(:server1), user: deploysecret(:user), roles: %w[web app db importer cron background] #server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron background) diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index fe873d00e..faf3f9d1b 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -3,7 +3,5 @@ set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) set :branch, ENV["branch"] || :master set :ssh_options, port: deploysecret(:ssh_port) -set :stage, :staging -set :rails_env, :staging server deploysecret(:server), user: deploysecret(:user), roles: %w[web app db importer cron]