diff options
| -rwxr-xr-x | config/alert-tracks-debian.ugly | 6 | ||||
| -rw-r--r-- | lib/tasks/config_files.rake | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.ugly index a109e1db4..1539b991d 100755 --- a/config/alert-tracks-debian.ugly +++ b/config/alert-tracks-debian.ugly @@ -13,10 +13,10 @@ # !!(*= $daemon_name *)!! Start the Alaveteli email alert daemon NAME=!!(*= $daemon_name *)!! -DAEMON=!!(*= $vhost_dir *)!!/alaveteli/script/runner +DAEMON=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/runner DAEMON_ARGS="--daemon TrackMailer.alert_tracks_loop" -PIDFILE=!!(*= $vhost_dir *)!!/alert-tracks.pid -LOGFILE=!!(*= $vhost_dir *)!!/alaveteli/log/alert-tracks.log +PIDFILE=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/tmp/pids/alert-tracks.pid +LOGFILE=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/log/alert-tracks.log DUSER=!!(*= $user *)!! # Set RAILS_ENV - not needed if using config/rails_env.rb # RAILS_ENV=your_rails_env diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake index 658f2a01c..529a364ca 100644 --- a/lib/tasks/config_files.rake +++ b/lib/tasks/config_files.rake @@ -23,7 +23,7 @@ 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 SCRIPT_FILE=config/alert-tracks-debian.ugly ' + example = 'rake config_files:convert_init_script DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli SCRIPT_FILE=config/alert-tracks-debian.ugly' check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', 'SCRIPT_FILE'], example) @@ -32,7 +32,8 @@ namespace :config_files do replacements = { :user => ENV['DEPLOY_USER'], - :vhost_dir => ENV['VHOST_DIR'] + :vhost_dir => ENV['VHOST_DIR'], + :vcspath => ENV.fetch('VCSPATH', 'alaveteli') } daemon_name = File.basename(script_file, '-debian.ugly') |