diff --git a/Capfile b/Capfile index a132828..dcdef25 100644 --- a/Capfile +++ b/Capfile @@ -35,7 +35,7 @@ install_plugin Capistrano::SCM::Git # require "capistrano/passenger" require 'capistrano/rails' -require 'capistrano/passenger' +#require 'capistrano/passenger' require 'capistrano/rbenv' set :rbenv_type, :user diff --git a/Gemfile b/Gemfile index 5649d49..abbc6c5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source 'https://rubygems.org' + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.0.0', '>= 5.0.0.1' # Use sqlite3 as the database for Active Record @@ -15,11 +16,12 @@ gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.2' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby - +gem 'unicorn' +gem 'execjs' +gem 'therubyracer' platform :ruby do gem 'pg' end - # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks @@ -37,7 +39,7 @@ gem 'jbuilder', '~> 2.5' gem 'devise' gem 'devise_uid' gem 'bcrypt', '~> 3.1.7' -gem 'simple_form' +gem 'simple_form' gem 'kaminari' gem 'to_csv-rails' gem 'bootstrap-multiselect-rails' diff --git a/config/deploy/production.rb b/config/deploy/production.rb index e3fba6c..3f988be 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -16,7 +16,11 @@ set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}" server 'ec2-54-169-212-254.ap-southeast-1.compute.amazonaws.com', user: 'ubuntu', roles: %w{web app db}, primary: true -ssh_options[:keys] = %w(ssh/nemo.pem) +set :ssh_options, { + keys: %w(/home/deploy/nemo_encoder/ssh/nemo.pem), + forward_agent: false, + user: 'ubuntu' +} set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}" set :rbenv_ruby, '2.3.1'