From b756c353451869cd64f0258138ef90cd0072a0d4 Mon Sep 17 00:00:00 2001 From: Georg Gadinger Date: Sun, 19 Apr 2020 14:32:42 +0200 Subject: [PATCH] make capistrano work with ed25519 keys --- Gemfile | 5 +++++ Gemfile.lock | 10 ++++++++++ config/deploy.rb | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3e9c5879..90b9c97f 100644 --- a/Gemfile +++ b/Gemfile @@ -87,6 +87,11 @@ end group :development do gem 'capistrano', '~> 3.8', require: false gem 'capistrano-rails', require: false + + gem 'rbnacl', '>= 3.2', '< 5.0', require: false + gem 'rbnacl-libsodium', require: false + gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false + gem 'ed25519', require: false end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index ca0370a9..aa98433f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,6 +62,7 @@ GEM autoprefixer-rails (9.7.6) execjs bcrypt (3.1.13) + bcrypt_pbkdf (1.0.1) better_errors (2.6.0) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -137,6 +138,7 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dry-inflector (0.2.0) + ed25519 (1.2.4) equalizer (0.0.11) erubi (1.9.0) excon (0.73.0) @@ -515,6 +517,10 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) + rbnacl (4.0.2) + ffi + rbnacl-libsodium (1.0.16) + rbnacl (>= 3.0.1) rbvmomi (2.4.1) builder (~> 3.0) json (>= 1.8) @@ -663,6 +669,7 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) + bcrypt_pbkdf (>= 1.0, < 2.0) better_errors bootstrap-sass (~> 3.4.0) bootstrap3-datetimepicker-rails (~> 4.7.14) @@ -680,6 +687,7 @@ DEPENDENCIES devise (~> 4.0) devise-async devise-i18n + ed25519 factory_girl_rails fake_email_validator faker @@ -715,6 +723,8 @@ DEPENDENCIES rails-i18n (~> 5.0) rails_admin rake + rbnacl (>= 3.2, < 5.0) + rbnacl-libsodium redcarpet redis rollbar diff --git a/config/deploy.rb b/config/deploy.rb index f7c6ebd1..2cf3bb7b 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid only for current version of Capistrano -lock "3.8.0" +lock "3.13.0" set :application, "retrospring" set :repo_url, "git@git.rrerr.net:nilsding/retrospring.git"