From d24ef1615faa2c4f7dabef1798da13b797af1e4a Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Sun, 20 Nov 2016 16:16:21 +0100
Subject: [PATCH] cleans up deploy.rb

---
 config/deploy.rb | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 59dd1d863..a4c68b728 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -7,16 +7,12 @@ def deploysecret(key)
 end
 
 set :rails_env, fetch(:stage)
-set :rvm_ruby_version, '2.3.1'
-set :rvm_type, :user
 set :rvm1_ruby_version, '2.3.2'
 
 set :application, 'consul'
 set :full_app_name, deploysecret(:full_app_name)
 
 set :server_name, deploysecret(:server_name)
-#set :repo_url, 'git@github.com:consul/consul.git'
-# If ssh access is restricted, probably you need to use https access
 set :repo_url, 'https://github.com/consul/consul.git'
 
 set :scm, :git
@@ -33,36 +29,23 @@ set :keep_releases, 5
 
 set :local_user, ENV['USER']
 
-# Run test before deploy
-set :tests, ["spec"]
-
 set :delayed_job_workers, 2
 
-# Config files should be copied by deploy:setup_config
 set(:config_files, %w(
   log_rotation
   database.yml
   secrets.yml
   unicorn.rb
-  sidekiq.yml
 ))
 
 set :whenever_roles, -> { :cron }
 
 namespace :deploy do
-  # Check right version of deploy branch
-  # before :deploy, "deploy:check_revision"
-  # Run test aund continue only if passed
-  # before :deploy, "deploy:run_tests"
   before :starting, 'rvm1:install:rvm'  # install/update RVM
   before :starting, 'rvm1:install:ruby' # install Ruby and create gemset
 
-  # Custom compile and rsync of assets - works, but it is very slow
-  #after 'deploy:symlink:shared', 'deploy:compile_assets_locally'
+  after :publishing, 'deploy:restart'
+  after :published, 'delayed_job:restart'
 
   after :finishing, 'deploy:cleanup'
-  # Restart unicorn
-  after 'deploy:publishing', 'deploy:restart'
-  # Restart Delayed Jobs
-  after 'deploy:published', 'delayed_job:restart'
 end
\ No newline at end of file