Merge pull request #832 from sul-dlss/deployment-improvements

Deployment improvements

Capfile

@@ -22,13 +22,13 @@ require 'capistrano/deploy'
 # require 'capistrano/rails/migrations'
 
 require 'capistrano/bundler'
-require 'capistrano/rails'
+require 'capistrano/delayed_job'
+require 'capistrano/honeybadger'
 require 'capistrano/passenger'
+require 'capistrano/rails'
+require 'capistrano/shared_configs'
 require 'dlss/capistrano'
-require 'capistrano/delayed_job'
 require 'whenever/capistrano'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
-
-require 'capistrano/honeybadger'

Gemfile

@@ -83,6 +83,7 @@ group :deployment do
   gem 'capistrano', '= 3.6.0' # pinned because inadvertent capistrano upgrades tend to cause deployment issues.
   gem 'capistrano-rails'
   gem 'capistrano-passenger'
+  gem 'capistrano-shared_configs'
   gem 'dlss-capistrano', '~> 3.1'
   gem 'capistrano3-delayed-job', '~> 1.0'
 end

Gemfile.lock

@@ -108,6 +108,7 @@ GEM
       capistrano-bundler (~> 1.1)
     capistrano-releaseboard (0.0.1)
       faraday
+    capistrano-shared_configs (0.1.1)
     capistrano3-delayed-job (1.7.2)
       capistrano (~> 3.0, >= 3.0.0)
     capybara (2.8.0)
@@ -557,6 +558,7 @@ DEPENDENCIES
   capistrano (= 3.6.0)
   capistrano-passenger
   capistrano-rails
+  capistrano-shared_configs
   capistrano3-delayed-job (~> 1.0)
   capybara
   capybara_discoball

config/deploy.rb

@@ -75,3 +75,9 @@
     end
   end
 end
+
+# honeybadger_env otherwise defaults to rails_env
+set :honeybadger_env, fetch(:stage)
+
+# update shared_configs before restarting app
+before 'deploy:restart', 'shared_configs:update'

config/deploy/prod-a.rb → config/deploy/prod.rb

@@ -1,4 +1,5 @@
 server 'argo-prod-a.stanford.edu', user: 'lyberadmin', roles: %w(web db app)
+server 'argo-prod-b.stanford.edu', user: 'lyberadmin', roles: %w(web db app)
 
 Capistrano::OneTimeKey.generate_one_time_key!
 set :rails_env, 'production'

config/deploy/stage-a.rb → config/deploy/stage.rb

@@ -1,4 +1,5 @@
 server 'argo-stage-a.stanford.edu', user: 'lyberadmin', roles: %w(web db app)
+server 'argo-stage-b.stanford.edu', user: 'lyberadmin', roles: %w(web db app)
 
 Capistrano::OneTimeKey.generate_one_time_key!
 set :rails_env, 'staging'