diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-06-25 17:49:49 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-07-15 16:30:58 +0100 |
| commit | ada1aeee86ced562a72f3be4bace65ba493cfdaf (patch) | |
| tree | 68f60a53b501c0d7ee8ff50213d309485ff8b2cf /lib/tasks | |
| parent | 6c022353806a8505a93dcfcde1cd29d5199332d8 (diff) | |
Use correct site name for alert tracks log and pid
ENV[‘SITE’] can be specified for the crontab (and elsewhere) so
allow the option here too.
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/config_files.rake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake index 529a364ca..438b63fc0 100644 --- a/lib/tasks/config_files.rake +++ b/lib/tasks/config_files.rake @@ -23,21 +23,23 @@ namespace :config_files do desc 'Convert Debian .ugly init script in config to a form suitable for installing in /etc/init.d' task :convert_init_script => :environment do - example = 'rake config_files:convert_init_script DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli SCRIPT_FILE=config/alert-tracks-debian.ugly' + example = 'rake config_files:convert_init_script DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli SITE=alaveteli SCRIPT_FILE=config/alert-tracks-debian.ugly' check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', 'SCRIPT_FILE'], example) script_file = ENV['SCRIPT_FILE'] + site = ENV.fetch('SITE', 'foi') replacements = { :user => ENV['DEPLOY_USER'], :vhost_dir => ENV['VHOST_DIR'], - :vcspath => ENV.fetch('VCSPATH', 'alaveteli') + :vcspath => ENV.fetch('VCSPATH', 'alaveteli'), + :site => site } daemon_name = File.basename(script_file, '-debian.ugly') - replacements.update(:daemon_name => "foi-#{daemon_name}") + replacements.update(:daemon_name => "#{ site }-#{ daemon_name }") converted = convert_ugly(script_file, replacements) rails_env_file = File.expand_path(File.join(Rails.root, 'config', 'rails_env.rb')) |