consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove duplication in deploy environment files

Browse Source 
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.
This commit is contained in:
Javi Martín
2019-11-12 18:13:41 +01:00
parent 1f4f70b4a9
commit 82e96edf1f
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/deploy.rb
View File

@@ -11,8 +11,11 @@ set :rvm1_map_bins, -> { fetch(:rvm_map_bins).to_a.concat(%w[rake gem bundle rub
set :application, "consul" set :application, "consul"
set :full_app_name, deploysecret(:full_app_name) set :full_app_name, deploysecret(:full_app_name)
set :deploy_to, deploysecret(:deploy_to)
set :server_name, deploysecret(:server_name) 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 :repo_url, "https://github.com/consul/consul.git"
set :revision, `git rev-parse --short #{fetch(:branch)}`.strip set :revision, `git rev-parse --short #{fetch(:branch)}`.strip

4
config/deploy/preproduction.rb
View File

@@ -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 :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(:server1), user: deploysecret(:user), roles: %w[web app db importer cron background]
server deploysecret(:server2), user: deploysecret(:user), roles: %w[web app db importer] server deploysecret(:server2), user: deploysecret(:user), roles: %w[web app db importer]

4
config/deploy/production.rb
View File

@@ -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 :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(: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) #server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron background)

4
config/deploy/staging.rb
View File

@@ -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 :branch, ENV["branch"] || :master
set :ssh_options, port: deploysecret(:ssh_port)
server deploysecret(:server), user: deploysecret(:user), roles: %w[web app db importer cron] server deploysecret(:server), user: deploysecret(:user), roles: %w[web app db importer cron]