From 82e96edf1f2bb1343f14b02c036a52d2c00f84ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 12 Nov 2019 18:13:41 +0100 Subject: [PATCH] Remove duplication in deploy environment files Deploy environment files were loaded after config/deploy.rb was loaded, meaning if we used settings like `deploy_to` or `current_path` to set variables inside the config/deploy.rb file, we'd be using the default settings instead of the ones dictated by the deploy environment files. --- config/deploy.rb | 5 ++++- config/deploy/preproduction.rb | 4 ---- config/deploy/production.rb | 4 ---- config/deploy/staging.rb | 4 ---- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index b3037b6e6..49fbfe295 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -11,8 +11,11 @@ set :rvm1_map_bins, -> { fetch(:rvm_map_bins).to_a.concat(%w[rake gem bundle rub set :application, "consul" set :full_app_name, deploysecret(:full_app_name) - +set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) +set :db_server, deploysecret(:db_server) +set :ssh_options, port: deploysecret(:ssh_port) + set :repo_url, "https://github.com/consul/consul.git" set :revision, `git rev-parse --short #{fetch(:branch)}`.strip diff --git a/config/deploy/preproduction.rb b/config/deploy/preproduction.rb index 1d282d1cf..7bbc3755a 100644 --- a/config/deploy/preproduction.rb +++ b/config/deploy/preproduction.rb @@ -1,8 +1,4 @@ -set :deploy_to, deploysecret(:deploy_to) -set :server_name, deploysecret(:server_name) -set :db_server, deploysecret(:db_server) set :branch, ENV["branch"] || :master -set :ssh_options, port: deploysecret(:ssh_port) 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 c9fc15c3c..73cc0679a 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,8 +1,4 @@ -set :deploy_to, deploysecret(:deploy_to) -set :server_name, deploysecret(:server_name) -set :db_server, deploysecret(:db_server) set :branch, :master -set :ssh_options, port: deploysecret(:ssh_port) 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 faf3f9d1b..7ef6191e4 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,7 +1,3 @@ -set :deploy_to, deploysecret(:deploy_to) -set :server_name, deploysecret(:server_name) -set :db_server, deploysecret(:db_server) set :branch, ENV["branch"] || :master -set :ssh_options, port: deploysecret(:ssh_port) server deploysecret(:server), user: deploysecret(:user), roles: %w[web app db importer cron]