From aa44a58e2d3cd0c7390c69fa615121701510f78b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 7 Jul 2017 15:36:08 +0200 Subject: Drop rvm deps and replace passenger with puma. --- Capfile | 4 ++-- Gemfile | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Capfile b/Capfile index 44d4253..7c089aa 100644 --- a/Capfile +++ b/Capfile @@ -14,14 +14,14 @@ require 'capistrano/deploy' # https://github.com/capistrano/bundler # https://github.com/capistrano/rails # -require 'capistrano/rvm' +# require 'capistrano/rvm' # require 'capistrano/rbenv' # require 'capistrano/chruby' require 'capistrano/bundler' require 'capistrano/rails/assets' require 'capistrano/rails/migrations' require 'capistrano/postgresql' -require 'capistrano/passenger' +# require 'capistrano/passenger' # Loads custom tasks from `lib/capistrano/tasks' if you have any defined. Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r } diff --git a/Gemfile b/Gemfile index 5397e63..a70ed8e 100644 --- a/Gemfile +++ b/Gemfile @@ -23,11 +23,9 @@ group :deployment do gem 'capistrano', '~> 3.3.4' gem 'capistrano-bundler' gem 'capistrano-rails' - gem 'capistrano-rvm' gem 'capistrano-postgresql', :git => 'https://github.com/snake66/capistrano-postgresql.git', :branch => 'make-sudo-optional' #'~>4.0' - gem 'capistrano-passenger' end # Gems used only for assets and not required @@ -51,7 +49,7 @@ gem 'bcrypt-ruby', '~> 3.0.0' # gem 'jbuilder' # Use unicorn as the app server -# gem 'unicorn' +gem 'puma' # To use debugger # gem 'debugger' -- cgit v1.2.3