diff --git a/Gemfile b/Gemfile index 9248a80..dd25269 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .coffee assets and views -gem 'coffee-rails' +gem 'coffee-rails' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby @@ -87,7 +87,7 @@ group :test do end group :production do - gem 'mysql2', '~> 0.3.0' + gem 'mysql2', '< 0.6.0', '>= 0.4.4' end gem 'high_voltage', '~> 2.4.0' diff --git a/config/deploy.rb b/config/deploy.rb index 13c1bfa..f712a86 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -2,9 +2,9 @@ # lock '3.1.0' set :application, 'Tab' -set :repo_url, 'git@github.com:ZeusWPI/Tab.git' +set :repo_url, 'https://github.com/ZeusWPI/Tab.git' -set :branch, 'master' +set :branch, 'herbert' set :deploy_to, '/home/tab/production' # Default branch is :master diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 4224ad9..7f1a392 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,4 +1,4 @@ -server 'zeus.ugent.be', user: 'tab', roles: %w{web app db}, ssh_options: { +server 'tab.zeus.gent', user: 'tab', roles: %w{web app db}, ssh_options: { forward_agent: true, auth_methods: ['publickey'], port: 2222 @@ -7,4 +7,4 @@ server 'zeus.ugent.be', user: 'tab', roles: %w{web app db}, ssh_options: { set :rails_env, 'production' set :rbenv_type, :system set :rbenv_ruby, File.read('.ruby-version').strip -set :default_env, 'RAILS_RELATIVE_URL_ROOT' => '/tab' +set :default_env, 'RAILS_RELATIVE_URL_ROOT' => '/'