From 309d13f497d9e254f4fea625a8a822a02518914a Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Sun, 16 Dec 2018 18:47:41 +0100
Subject: [PATCH] update ruby version, change deployment target

---
 .ruby-version               | 2 +-
 Capfile                     | 2 +-
 Gemfile                     | 1 -
 Gemfile.lock                | 6 +-----
 config/deploy.rb            | 2 +-
 config/deploy/production.rb | 2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index bed811b0..aedc15bb 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-2.3.3
+2.5.3
diff --git a/Capfile b/Capfile
index 350ceaf0..de6cec89 100644
--- a/Capfile
+++ b/Capfile
@@ -9,7 +9,7 @@ require "capistrano/scm/git"
 install_plugin Capistrano::SCM::Git
 
 # Include tasks from other gems included in your Gemfile
-require "rvm1/capistrano3"
+#require "rvm1/capistrano3"
 require "capistrano/bundler"
 require "capistrano/rails/assets"
 require "capistrano/rails/migrations"
diff --git a/Gemfile b/Gemfile
index 47e10784..4619f811 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,6 @@ end
 group :development do
   gem 'capistrano', '~> 3.8', require: false
   gem 'capistrano-rails', require: false
-  gem 'rvm1-capistrano3', require: false
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 26397144..03b2a734 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -501,9 +501,6 @@ GEM
     rspec-support (3.5.0)
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
-    rvm1-capistrano3 (1.4.0)
-      capistrano (~> 3.0)
-      sshkit (>= 1.2)
     sanitize (4.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
@@ -673,7 +670,6 @@ DEPENDENCIES
   rollbar
   rspec-rails (~> 3.5)
   ruby-progressbar
-  rvm1-capistrano3
   sanitize
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.1)
@@ -697,4 +693,4 @@ DEPENDENCIES
   will_paginate-bootstrap
 
 BUNDLED WITH
-   1.14.6
+   1.16.3
diff --git a/config/deploy.rb b/config/deploy.rb
index a1ecf8a0..f7c6ebd1 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -8,7 +8,7 @@ set :repo_url, "git@git.rrerr.net:nilsding/retrospring.git"
 ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
 
 # Default deploy_to directory is /var/www/my_app_name
-set :deploy_to, "/usr/home/justask/apps/retrospring"
+set :deploy_to, "/home/justask/apps/retrospring"
 
 # Default value for :format is :airbrussh.
 # set :format, :airbrussh
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 82bd2742..d2de3084 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -1,5 +1,5 @@
 # Defines a single server with a list of roles and multiple properties.
-server "dragon.nilsding.org", user: "justask", roles: %w{app db web}
+server "retrospring-001.aws.infra.retrospring.net", user: "justask", roles: %w{app db web}
 
 # Configuration
 # =============