Edit capistrano whenever settings

3 files changed, 9 insertions, 6 deletions

diff --git a/Gemfile b/Gemfile
index e9a2fbb84..854a581d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -102,7 +102,7 @@ gem 'acts_as_tree', '~> 2.1.0', require: 'acts_as_tree'
 gem 'rabl'
 
 gem 'delayed_job_active_record'
-gem 'whenever', require: false
+gem 'whenever', '~> 0.8', require: false
 gem 'devise-async'
 gem 'apartment', '~> 1.0.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0cc9c4685..61066aefa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -592,7 +592,7 @@ DEPENDENCIES
   turbolinks
   uglifier (~> 2.7.2)
   webmock
-  whenever
+  whenever (~> 0.8)
   will_paginate (~> 3.0.7)
   will_paginate-bootstrap (~> 1.0.1)
 
diff --git a/config/deploy.rb b/config/deploy.rb
index 4b79cfa5b..38175dfff 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -21,12 +21,15 @@ set :copy_exclude, [ '.git' ]
 ssh_options[:forward_agent] = true
 
 require "bundler/capistrano"
-require "whenever/capistrano"
+require 'whenever/capistrano'
 
 # Whenever
-set :whenever_command, "bundle exec whenever"
-set :whenever_environment, -> { fetch(:stage) }
-set :whenever_identifier, -> { "#{fetch(:application)}_#{fetch(:stage)}" }
+set :whenever_command, "sudo /usr/local/sbin/whenever-sudo" # use sudo to change www-data crontab
+set :whenever_command_environment_variables, -> { "NEW_RELIC_LOG=stdout" } # avoid log/newrelic.log access
+set :whenever_user, "www-data" # use www-data crontab
+set :whenever_variables, ->{ "'environment=#{fetch :whenever_environment}&bundle_command=script/bundle exec'" } # invoke script/bundle to use 'correct' ruby environment
+set :whenever_update_flags, ->{ "--update-crontab #{fetch :whenever_identifier} --set #{fetch :whenever_variables} --user #{fetch :whenever_user}" } # user whenever_user
+set :whenever_clear_flags,  ->{ "--clear-crontab #{fetch :whenever_identifier} --user #{fetch :whenever_user}" } # use whenever_user
 
 namespace :deploy do
   task :start do ; end