From 32e29777397ace9c1f8980d279a52686a26d4389 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Wed, 8 Aug 2018 00:24:39 +0200 Subject: [PATCH] Fix deploying on herbert --- Gemfile | 2 +- Gemfile.lock | 13 ++++++++----- config/deploy/production.rb | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 28202eb..2743505 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,7 @@ group :development do gem 'spring', '1.6.2' # Deployment - gem 'capistrano', '~> 3.1' + gem 'capistrano', '~> 3.4' gem 'capistrano-rails', '~> 1.1' gem 'capistrano-rvm' gem 'capistrano-rbenv' diff --git a/Gemfile.lock b/Gemfile.lock index 567887b..0de3561 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,8 @@ GEM airbrake (4.3.5) builder multi_json + airbrussh (1.3.0) + sshkit (>= 1.6.1, != 1.7.0) annotate (2.7.0) activerecord (>= 3.2, < 6.0) rake (~> 10.4) @@ -52,10 +54,11 @@ GEM builder (3.2.3) byebug (10.0.2) cancancan (1.13.1) - capistrano (3.4.0) + capistrano (3.11.0) + airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) - sshkit (~> 1.3) + sshkit (>= 1.9.0) capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) @@ -174,7 +177,7 @@ GEM mysql2 (0.3.20) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.0.2) + net-ssh (5.0.2) netrc (0.11.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) @@ -279,7 +282,7 @@ GEM activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sqlite3 (1.3.11) - sshkit (1.8.1) + sshkit (1.17.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) term-ansicolor (1.3.2) @@ -317,7 +320,7 @@ DEPENDENCIES bootstrap-will_paginate (= 0.0.10) byebug cancancan (= 1.13.1) - capistrano (~> 3.1) + capistrano (~> 3.4) capistrano-passenger capistrano-rails (~> 1.1) capistrano-rbenv diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 18b89c1..3fde857 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,4 +1,4 @@ -server 'tap.ugent.be', user: 'tap', roles: %w{web app db}, ssh_options: { +server 'tap.zeus.gent', user: 'tap', roles: %w{web app db}, ssh_options: { forward_agent: true, auth_methods: ['publickey'], port: 2222