diff --git a/Capfile b/Capfile index 3206f78..b670d5e 100644 --- a/Capfile +++ b/Capfile @@ -1,9 +1,6 @@ # Load DSL and set up stages require 'capistrano/setup' -require "capistrano/scm/git" -install_plugin Capistrano::SCM::Git - # Include default deployment tasks require 'capistrano/deploy' @@ -26,3 +23,6 @@ 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 } + +require "capistrano/scm/git" +install_plugin Capistrano::SCM::Git diff --git a/config/deploy.rb b/config/deploy.rb index 26ab36c..1ae0cbf 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid only for current version of Capistrano -lock '3.4.1' +lock '3.8.1' set :application, 'webdev' set :repo_url, 'git@github.com:webdev-camp/webdev.camp.git' @@ -16,8 +16,6 @@ set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/ # Default value for default_env is {} # set :default_env, { path: "/opt/ruby/bin:$PATH" } -set :use_sudo, false - namespace :deploy do after :restart, :clear_cache do diff --git a/config/deploy/production.rb b/config/deploy/production.rb index f99bf51..f27971f 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -6,5 +6,3 @@ server 'webdev.camp', user: 'webdev', roles: %w{app db web} # server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value # server 'db.example.com', user: 'deploy', roles: %w{db} - -set :passenger_restart_with_touch, true