From 1141369eb6fdb3b58a802fdcc5fef2c2909473c6 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Thu, 14 Dec 2017 15:56:11 +0100
Subject: Use rake variable in deply:seed task

---
 config/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/deploy.rb')

diff --git a/config/deploy.rb b/config/deploy.rb
index a8d44d3e5..33771507f 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -90,6 +90,6 @@ namespace :deploy do
 
   desc "Run db:seed"
   task :seed do
-    run "cd #{current_path} && #{bundle_cmd} exec /var/lib/gems/2.2.0/bin/rake db:seed RAILS_ENV=#{rails_env}"
+    run "cd #{current_path} && #{rake} db:seed RAILS_ENV=#{rails_env}"
   end
 end
-- 
cgit v1.2.3


From 06cd19c2e8e65ba0d94ded32ebe613993ba02c00 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Thu, 21 Dec 2017 22:39:00 +0100
Subject: Switch to ruby 2.3 in capistrano. Refs #5368

---
 config/deploy.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'config/deploy.rb')

diff --git a/config/deploy.rb b/config/deploy.rb
index 33771507f..23d8ae954 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -9,8 +9,8 @@ set :deploy_to, "/var/www/stif-boiv"
 set :use_sudo, false
 default_run_options[:pty] = true
 set :group_writable, true
-set :bundle_cmd, "/var/lib/gems/2.2.0/bin/bundle"
-set :rake, "#{bundle_cmd} exec /var/lib/gems/2.2.0/bin/rake"
+set :bundle_cmd, "/var/lib/gems/2.3.0/bin/bundle"
+set :rake, "#{bundle_cmd} exec /var/lib/gems/2.3.0/bin/rake"
 
 set :keep_releases, -> { fetch(:kept_releases, 5) }
 after "deploy:restart", "deploy:cleanup"
@@ -29,7 +29,7 @@ require 'whenever/capistrano'
 #after 'deploy:finalize_update', 'npm:install'
 
 # Whenever
-set :whenever_variables, ->{ "'environment=#{fetch :whenever_environment}&bundle_command=bin/bundle exec&additionnal_path=/var/lib/gems/2.2.0/bin'" } # invoke bin/bundle to use 'correct' ruby environment
+set :whenever_variables, ->{ "'environment=#{fetch :whenever_environment}&bundle_command=bin/bundle exec&additionnal_path=/var/lib/gems/2.3.0/bin'" } # invoke bin/bundle to use 'correct' ruby environment
 
 set :whenever_command, "sudo /usr/local/sbin/whenever-sudo" # use sudo to change www-data crontab
 set :whenever_user, "www-data" # use www-data crontab
-- 
cgit v1.2.3


From 2cab7960c66d9fb23f4f00f5e22ff2820e06d0ea Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Thu, 21 Dec 2017 23:08:43 +0100
Subject: Remove absolute path for rake in capistrano. Refs #5368

---
 config/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/deploy.rb')

diff --git a/config/deploy.rb b/config/deploy.rb
index 23d8ae954..d541f2581 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -10,7 +10,7 @@ set :use_sudo, false
 default_run_options[:pty] = true
 set :group_writable, true
 set :bundle_cmd, "/var/lib/gems/2.3.0/bin/bundle"
-set :rake, "#{bundle_cmd} exec /var/lib/gems/2.3.0/bin/rake"
+set :rake, "#{bundle_cmd} exec rake"
 
 set :keep_releases, -> { fetch(:kept_releases, 5) }
 after "deploy:restart", "deploy:cleanup"
-- 
cgit v1.2.3