diff --git a/.ruby-version b/.ruby-version index d64a644..437459c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.0-dev +2.5.0 diff --git a/Capfile b/Capfile index 8de4b12..7c35a22 100644 --- a/Capfile +++ b/Capfile @@ -3,6 +3,8 @@ require 'capistrano/setup' # Includes default deployment tasks require 'capistrano/deploy' +require "capistrano/scm/git" +install_plugin Capistrano::SCM::Git require 'capistrano/rails' require 'capistrano/rbenv' diff --git a/config/deploy.rb b/config/deploy.rb index 3f1968a..a3af85b 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -2,9 +2,9 @@ # lock '3.1.0' set :application, 'Tap' -set :repo_url, 'git@github.com:ZeusWPI/Tap.git' +set :repo_url, 'https://github.com/ZeusWPI/Tap.git' -set :branch, 'master' +set :branch, 'herbert' set :deploy_to, '/home/tap/production' # Default branch is :master diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 18ef671..3fde857 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,4 +1,4 @@ -server 'zeus.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