From 2eff914f123e8c1d7ba7aac7c200bbd90bdb4f89 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Fri, 17 May 2019 15:23:58 +0200 Subject: [PATCH] suite --- Capfile | 3 ++- Gemfile.lock | 3 +++ config/deploy.rb | 7 ++++--- config/deploy/production.rb | 4 ++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Capfile b/Capfile index 138b8f8..ef93dfd 100644 --- a/Capfile +++ b/Capfile @@ -29,8 +29,9 @@ install_plugin Capistrano::SCM::Git require "capistrano/rvm" # require "capistrano/rbenv" # require "capistrano/chruby" -require "capistrano/bundler" require "capistrano/rails/assets" +require "capistrano/bundler" + require "capistrano/rails/migrations" # require "capistrano/passenger" diff --git a/Gemfile.lock b/Gemfile.lock index 6289c40..56f1311 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,6 +82,8 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) + capistrano3-nginx (2.1.6) + capistrano (>= 3.0.0) capybara (3.18.0) addressable mini_mime (>= 0.1.3) @@ -344,6 +346,7 @@ DEPENDENCIES capistrano-bundler (~> 1.1) capistrano-rails (~> 1.1) capistrano-rvm + capistrano3-nginx (~> 2.0) capybara (>= 2.15) carrierwave coffee-rails diff --git a/config/deploy.rb b/config/deploy.rb index 1e597da..6af8449 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,3 +1,5 @@ +#require "rvm/capistrano" + # config valid for current version and patch releases of Capistrano lock "~> 3.11.0" @@ -6,6 +8,5 @@ set :application, 'qi6_app' set :domain, 'quartz-www02.sysnove.net' - - - +set :rvm_ruby_version, '2.6.0' # use the same ruby as used locally for deployment +set :rvm_autolibs_flag, "read-only" diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 68f256b..d2641bc 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -5,6 +5,8 @@ server "quartz.snlab.fr", user: "web", roles: %w{web app db} set :branch, ENV["REVISION"] || ENV["BRANCH_NAME"] || "master" + + # server-based syntax # ====================== # Defines a single server with a list of roles and multiple properties. @@ -37,7 +39,9 @@ set :branch, ENV["REVISION"] || ENV["BRANCH_NAME"] || "master" # For available Capistrano configuration variables see the documentation page. # http://capistranorb.com/documentation/getting-started/configuration/ # Feel free to add new variables to customise your setup. +set :deploy_to, "/srv/www/web/#{fetch(:application)}/" +set :repo_url, "git@quartz.snlab.fr:nicolas/#{fetch(:application)}.git" # Custom SSH Options