From 8fdaf441159cffa4cb32d13bada3b6c9e5f70b43 Mon Sep 17 00:00:00 2001
From: Tom Naessens <Tom.Naessens@UGent.be>
Date: Tue, 1 Sep 2015 15:05:56 +0200
Subject: [PATCH] Fix deployment

---
 .ruby-version                         | 2 +-
 Capfile                               | 4 ++--
 config/deploy/production.rb           | 5 +++--
 config/deploy/{king.rb => staging.rb} | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename config/deploy/{king.rb => staging.rb} (70%)

diff --git a/.ruby-version b/.ruby-version
index ccbccc3..b1b25a5 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.2.0
+2.2.2
diff --git a/Capfile b/Capfile
index 360b373..8de4b12 100644
--- a/Capfile
+++ b/Capfile
@@ -5,8 +5,8 @@ require 'capistrano/setup'
 require 'capistrano/deploy'
 
 require 'capistrano/rails'
-#require 'capistrano/rbenv'
-require 'capistrano/rvm'
+require 'capistrano/rbenv'
+#require 'capistrano/rvm'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 1fded02..52ad315 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -1,8 +1,9 @@
-server 'zeus.ugent.be', user: 'tab', roles: %w{web app db},
-  ssh_options: {
+server 'zeus.ugent.be', user: 'tab', roles: %w{web app db}, ssh_options: {
   forward_agent: true,
   auth_methods: ['publickey'],
   port: 2222
 }
 
 set :rails_env, 'production'
+set :rbenv_type, :system
+set :rbenv_ruby, File.read('.ruby-version').strip
diff --git a/config/deploy/king.rb b/config/deploy/staging.rb
similarity index 70%
rename from config/deploy/king.rb
rename to config/deploy/staging.rb
index c6198e1..c547783 100644
--- a/config/deploy/king.rb
+++ b/config/deploy/staging.rb
@@ -6,5 +6,3 @@ server 'king.ugent.be', user: 'tab', roles: %w{web app db},
 }
 
 set :rails_env, 'production'
-set :rbenv_type, :system
-set :rbenv_ruby, File.read('.ruby-version').strip