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

Unify deploy secret keys for the main server

Browse Source 
We were using `server` on staging but `server1` and `server2` on
preproduction and production.

The reason behind it is we've always used one server on staging but
sometimes we've used several servers on preproduction and production.

However, this is a bit of a mess on installations which have only one
server on preproduction or production and need to use the `server` key
for the staging environments but `server1` for other environments.

So, in order to keep compatibility with existing Consul installations,
we're now allowing either `server` or `server1` on any environment.
This commit is contained in:
Javi Martín
2023-03-21 19:01:26 +01:00
parent b115b0cc8d
commit 8aa113a47c
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/deploy-secrets.yml.example
View File

@@ -7,12 +7,12 @@ staging:
preproduction: preproduction:
deploy_to: "/home/deploy/consul" deploy_to: "/home/deploy/consul"
ssh_port: "2222" ssh_port: "2222"
server1: xxx.xxx.xxx.xxx server: xxx.xxx.xxx.xxx
user: "deploy" user: "deploy"
production: production:
deploy_to: "/home/deploy/consul" deploy_to: "/home/deploy/consul"
ssh_port: "22" ssh_port: "22"
server1: xxx.xxx.xxx.xxx server: xxx.xxx.xxx.xxx
server2: xxx.xxx.xxx.xxx server2: xxx.xxx.xxx.xxx
user: "deploy" user: "deploy"

10
config/deploy.rb
View File

@@ -3,7 +3,15 @@ lock "~> 3.17.1"
def deploysecret(key) def deploysecret(key)
@deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml")[fetch(:stage).to_s] @deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml")[fetch(:stage).to_s]
@deploy_secrets_yml.fetch(key.to_s, "undefined") @deploy_secrets_yml.fetch(key.to_s, "")
end
def main_deploy_server
if deploysecret(:server1) && !deploysecret(:server1).empty?
deploysecret(:server1)
else
deploysecret(:server)
end
end end
set :rails_env, fetch(:stage) set :rails_env, fetch(:stage)

2
config/deploy/preproduction.rb
View File

@@ -1,3 +1,3 @@
set :branch, ENV["branch"] || :master set :branch, ENV["branch"] || :master
server deploysecret(:server1), user: deploysecret(:user), roles: %w[web app db importer cron background] server main_deploy_server, user: deploysecret(:user), roles: %w[web app db importer cron background]

2
config/deploy/production.rb
View File

@@ -1,6 +1,6 @@
set :branch, ENV["branch"] || :master set :branch, ENV["branch"] || :master
server deploysecret(:server1), user: deploysecret(:user), roles: %w[web app db importer cron background] server main_deploy_server, 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)
#server deploysecret(:server3), user: deploysecret(:user), roles: %w(web app db importer) #server deploysecret(:server3), user: deploysecret(:user), roles: %w(web app db importer)
#server deploysecret(:server4), user: deploysecret(:user), roles: %w(web app db importer) #server deploysecret(:server4), user: deploysecret(:user), roles: %w(web app db importer)

2
config/deploy/staging.rb
View File

@@ -1,3 +1,3 @@
set :branch, ENV["branch"] || :master set :branch, ENV["branch"] || :master
server deploysecret(:server), user: deploysecret(:user), roles: %w[web app db importer cron background] server main_deploy_server, user: deploysecret(:user), roles: %w[web app db importer cron background]