Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop

1 files changed, 15 insertions, 8 deletions

diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake
index 60814cb27..438b63fc0 100644
--- a/lib/tasks/config_files.rake
+++ b/lib/tasks/config_files.rake
@@ -23,26 +23,33 @@ 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 '
-        check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', 'SCRIPT_FILE'], example)
+        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)
 
-        deploy_user = ENV['DEPLOY_USER']
-        vhost_dir = ENV['VHOST_DIR']
         script_file = ENV['SCRIPT_FILE']
+        site = ENV.fetch('SITE', 'foi')
 
-        replacements = { :user => deploy_user,
-                         :vhost_dir => vhost_dir }
+        replacements = {
+            :user => ENV['DEPLOY_USER'],
+            :vhost_dir => ENV['VHOST_DIR'],
+            :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'))
-        if !File.exists?(rails_env_file)
+
+        unless File.exists?(rails_env_file)
             converted.each do |line|
                 line.gsub!(/^#\s*RAILS_ENV=your_rails_env/, "RAILS_ENV=#{Rails.env}")
                 line.gsub!(/^#\s*export RAILS_ENV/, "export RAILS_ENV")
             end
         end
+
         converted.each do |line|
             puts line
         end