From 28b282df1212a3fb20e1de900bbd60b9c4b33c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Wed, 4 Nov 2020 16:23:52 +0100
Subject: [PATCH] Remove unused deployment configuration variables

The server_name variable isn't used since we removed the Apache task in
commit 012d5297e, db_server and config_files aren't used since we
removed the capistrano templates in that same commit, and full_app_name
isn't used since commit 94a7e13dc.
---
 config/deploy-secrets.yml.example | 9 ---------
 config/deploy.rb                  | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/config/deploy-secrets.yml.example b/config/deploy-secrets.yml.example
index d6594e358..c6fab9fe4 100644
--- a/config/deploy-secrets.yml.example
+++ b/config/deploy-secrets.yml.example
@@ -2,27 +2,18 @@ staging:
   deploy_to: "/var/www/consul"
   ssh_port: "21"
   server: "staging.consul.es"
-  db_server: "postgre.consul.es"
   user: "xxxxx"
-  server_name: "staging.consul.es"
-  full_app_name: "consul"
 
 preproduction:
   deploy_to: "/var/www/consul"
   ssh_port: "2222"
   server1: xxx.xxx.xxx.xxx
   server2: xxx.xxx.xxx.xxx
-  db_server: xxx.xxx.xxx.xxx
   user: xxxxx
-  server_name: pre.consul.es
-  full_app_name: "consul"
 
 production:
   deploy_to: "/var/www/consul"
   ssh_port: "22"
   server1: xxx.xxx.xxx.xxx
   server2: xxx.xxx.xxx.xxx
-  db_server: xxx.xxx.xxx.xxx
   user: "deploy"
-  server_name: "consul.es"
-  full_app_name: "consul"
diff --git a/config/deploy.rb b/config/deploy.rb
index 0da9af9c5..1236fc326 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -10,10 +10,7 @@ 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 :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"
@@ -36,12 +33,6 @@ set :puma_conf, "#{release_path}/config/puma/#{fetch(:rails_env)}.rb"
 set :delayed_job_workers, 2
 set :delayed_job_roles, :background
 
-set(:config_files, %w[
-  log_rotation
-  database.yml
-  secrets.yml
-])
-
 set :whenever_roles, -> { :app }
 
 namespace :deploy do