diff --git a/config/deploy-secrets.yml.example b/config/deploy-secrets.yml.example index 2b32a6725..1e1f52a1b 100644 --- a/config/deploy-secrets.yml.example +++ b/config/deploy-secrets.yml.example @@ -2,6 +2,7 @@ default: &default deploy_to: "/home/deploy/consul" ssh_port: "22" user: "deploy" + app_name: "consul" staging: <<: *default diff --git a/config/deploy.rb b/config/deploy.rb index 34944a9c8..145380bc3 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,9 +1,9 @@ # config valid only for current version of Capistrano lock "~> 3.17.1" -def deploysecret(key) +def deploysecret(key, default: "") @deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml")[fetch(:stage).to_s] - @deploy_secrets_yml.fetch(key.to_s, "") + @deploy_secrets_yml.fetch(key.to_s, default) end def main_deploy_server @@ -17,7 +17,7 @@ end set :rails_env, fetch(:stage) set :rvm1_map_bins, -> { fetch(:rvm_map_bins).to_a.concat(%w[rake gem bundle ruby]).uniq } -set :application, "consul" +set :application, deploysecret(:app_name, default: "consul") set :deploy_to, deploysecret(:deploy_to) set :ssh_options, port: deploysecret(:ssh_port)