From a6c11111cd7247511bea3f1de7c42ff5deaa1c3f Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Thu, 19 Jun 2014 11:32:06 +0100 Subject: Add MAILTO option to convert_crontab task Less manual editing for reinstallers. Existing backwards-compatibility: $ bundle exec rake config_files:convert_crontab \ DEPLOY_USER=deploy \ VHOST_DIR=/home/vagrant/ \ VCSPATH=alaveteli \ SITE=alaveteli \ CRONTAB=config/crontab-example | grep 'MAILTO=' MAILTO=cron-alaveteli@mysociety.org New optional MAILTO option: $ bundle exec rake config_files:convert_crontab \ DEPLOY_USER=deploy \ VHOST_DIR=/home/vagrant/ \ VCSPATH=alaveteli \ SITE=alaveteli CRONTAB=config/crontab-example \ MAILTO=cron@example.org | grep 'MAILTO=' MAILTO=cron@example.org --- lib/tasks/config_files.rake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/tasks/config_files.rake') diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake index d0e4001f0..60814cb27 100644 --- a/lib/tasks/config_files.rake +++ b/lib/tasks/config_files.rake @@ -50,7 +50,7 @@ namespace :config_files do desc 'Convert Debian .ugly crontab file in config to a form suitable for installing in /etc/cron.d' task :convert_crontab => :environment do - example = 'rake config_files:convert_crontab DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli SITE=alaveteli CRONTAB=config/crontab-example' + example = 'rake config_files:convert_crontab DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli SITE=alaveteli CRONTAB=config/crontab-example MAILTO=cron-alaveteli@example.org' check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', 'VCSPATH', @@ -60,7 +60,8 @@ namespace :config_files do :user => ENV['DEPLOY_USER'], :vhost_dir => ENV['VHOST_DIR'], :vcspath => ENV['VCSPATH'], - :site => ENV['SITE'] + :site => ENV['SITE'], + :mailto => ENV.fetch('MAILTO') { "cron-#{ ENV['SITE'] }@mysociety.org" } } convert_ugly(ENV['CRONTAB'], replacements).each do |line| puts line -- cgit v1.2.3