diff --git a/Capfile b/Capfile index bccdc3ab9..b565fae23 100644 --- a/Capfile +++ b/Capfile @@ -8,6 +8,7 @@ require 'capistrano/rvm' require 'capistrano/bundler' require 'capistrano/rails/assets' require 'capistrano/rails/migrations' +require 'capistrano/passenger' # Load custom tasks from `lib/capistrano/tasks` if you have any defined Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r } diff --git a/Gemfile b/Gemfile index 68069b954..3ede96cce 100644 --- a/Gemfile +++ b/Gemfile @@ -50,6 +50,7 @@ group :development, :test do gem "capistrano-bundler", '1.1.4', require: false gem "capistrano-rails", '1.1.3', require: false gem "capistrano-rvm", require: false + gem "capistrano-passenger", require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index bda9c97b3..bdeda8b6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,6 +60,8 @@ GEM capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) + capistrano-passenger (0.1.1) + capistrano (~> 3.0) capistrano-rails (1.1.3) capistrano (~> 3.1) capistrano-bundler (~> 1.1) @@ -294,6 +296,7 @@ DEPENDENCIES byebug capistrano (= 3.4.0) capistrano-bundler (= 1.1.4) + capistrano-passenger capistrano-rails (= 1.1.3) capistrano-rvm capybara diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index 9a2008ddc..5ca436c42 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -2,4 +2,6 @@ set :deploy_to, deploysecret(:deploy_to) set :branch, :master set :ssh_options, port: deploysecret(:ssh_port) +set :passenger_restart_with_sudo, false + server deploysecret(:server), user: deploysecret(:user), roles: %w(web app db importer)