diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-06-25 12:46:26 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-06-25 12:46:26 +0100 |
| commit | c99c9ef86c9020939cf8d0930faca5bd206e111f (patch) | |
| tree | be011c0821d2d4d1bb7bf936bd47657de26792c6 /lib/tasks/config_files.rake | |
| parent | a9389e60e3e2f912ef3131351ab37551a3929a2a (diff) | |
| parent | a6c11111cd7247511bea3f1de7c42ff5deaa1c3f (diff) | |
Merge branch 'convert-crontab-mailto' into rails-3-develop
Diffstat (limited to 'lib/tasks/config_files.rake')
| -rw-r--r-- | lib/tasks/config_files.rake | 5 |
1 files changed, 3 insertions, 2 deletions
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 |