Update cap and deploy info for diglib machines

Gemfile

@@ -48,15 +48,15 @@ group :development do
   # Use Puma as the app server
   gem 'puma'
   # Use Capistrano for deployment
-  gem 'capistrano', '~> 3.5.0', require: false
+  gem 'capistrano', '~> 3.17.3', require: false
   # Rails and Bundler integrations were moved out from Capistrano 3
-  gem 'capistrano-rails', '~> 1.1', require: false
+  gem 'capistrano-rails', '~> 1.4', require: false
   gem 'capistrano-bundler', '~> 1.1', require: false
   # "idiomatic support for your preferred ruby version manager"
   gem 'capistrano-rvm', '~> 0.1', require: false
   # The `deploy:restart` hook for passenger applications is now in a separate gem
   # Just add it to your Gemfile and require it in your Capfile.
-  gem 'capistrano-passenger', '~> 0.1', require: false
+  gem 'capistrano-passenger', '~> 0.2', require: false
 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'

Gemfile.lock

@@ -83,15 +83,13 @@ GEM
     bootsnap (1.17.0)
       msgpack (~> 1.2)
     builder (3.2.4)
-    capistrano (3.5.0)
+    capistrano (3.17.3)
       airbrussh (>= 1.0.0)
-      capistrano-harrow
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
     capistrano-bundler (1.6.0)
       capistrano (~> 3.1)
-    capistrano-harrow (0.5.3)
     capistrano-passenger (0.2.1)
       capistrano (~> 3.0)
     capistrano-rails (1.6.3)
@@ -128,7 +126,7 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     io-console (0.7.1)
-    irb (1.10.1)
+    irb (1.11.0)
       rdoc
       reline (>= 0.3.8)
     jquery-rails (4.6.0)
@@ -163,12 +161,12 @@ GEM
       net-ssh (>= 2.6.5, < 8.0.0)
     net-smtp (0.4.0)
       net-protocol
-    net-ssh (7.2.0)
+    net-ssh (7.2.1)
     nio4r (2.7.0)
     nokogiri (1.15.5-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    psych (5.1.1.1)
+    psych (5.1.2)
       stringio
     puma (6.4.0)
       nio4r (~> 2.0)
@@ -289,10 +287,10 @@ PLATFORMS
 DEPENDENCIES
   bcrypt (~> 3.1.7)
   bootsnap (>= 1.4.2)
-  capistrano (~> 3.5.0)
+  capistrano (~> 3.17.3)
   capistrano-bundler (~> 1.1)
-  capistrano-passenger (~> 0.1)
-  capistrano-rails (~> 1.1)
+  capistrano-passenger (~> 0.2)
+  capistrano-rails (~> 1.4)
   capistrano-rvm (~> 0.1)
   coffee-rails (~> 4.2)
   devise

config/deploy.rb

@@ -1,4 +1,4 @@
-lock '3.5.0'
+lock '3.17.3'
 
 set :department, 'ldpd'
 set :instance, fetch(:department)
@@ -9,14 +9,15 @@
 # Default value for :rails_env is fetch(:stage)
 set :rails_env, fetch(:deploy_name)
 # use the rvm wrapper
+set :rvm_custom_path, '~/.rvm-alma8'
 set :rvm_ruby_version, fetch(:deploy_name)
 
 set :repo_url, "[email protected]:cul/#{fetch(:repo_name)}.git"
 
-set :remote_user, "#{fetch(:instance)}serv"
+set :remote_user, "renserv"
 # Default deploy_to directory is /var/www/:application
 # set :deploy_to, '/var/www/my_app_name'
-set :deploy_to, "/opt/passenger/#{fetch(:instance)}/#{fetch(:deploy_name)}"
+set :deploy_to, "/opt/passenger/#{fetch(:deploy_name)}"
 
 # Default value for :scm is :git
 # set :scm, :git

config/deploy/dev.rb

@@ -1,3 +1,3 @@
-server 'all-nginx-dev1.cul.columbia.edu', user: fetch(:remote_user), roles: %w(app db web)
+server 'diglib-rails-dev1.cul.columbia.edu', user: fetch(:remote_user), roles: %w(app db web)
 # Current branch is suggested by default in development
 ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp

config/deploy/prod.rb

@@ -1,3 +1,3 @@
-server "#{fetch(:instance)}-nginx-#{fetch(:stage)}1.cul.columbia.edu", user: fetch(:remote_user), roles: %w(app db web)
+server 'diglib-rails-prod1.cul.columbia.edu', user: fetch(:remote_user), roles: %w(app db web)
 # In test/prod, deploy from release tags; most recent version is default
 ask :branch, proc { `git tag --sort=version:refname`.split("\n").last }

config/deploy/test.rb

@@ -1,3 +1,3 @@
-server "#{fetch(:instance)}-nginx-#{fetch(:stage)}1.cul.columbia.edu", user: fetch(:remote_user), roles: %w(app db web)
+server 'diglib-rails-test1.cul.columbia.edu', user: fetch(:remote_user), roles: %w(app db web)
 # In test/prod, deploy from release tags; most recent version is default
 ask :branch, proc { `git tag --sort=version:refname`.split("\n").last }