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 From b8ba73043e9e7ff08c38c56126ab5c2d8e1632fd Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 25 Jun 2014 16:46:36 +0100 Subject: Minor tidying of alert-tracks generation --- lib/tasks/config_files.rake | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'lib/tasks/config_files.rake') diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake index 60814cb27..658f2a01c 100644 --- a/lib/tasks/config_files.rake +++ b/lib/tasks/config_files.rake @@ -24,25 +24,29 @@ 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) + 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'] - replacements = { :user => deploy_user, - :vhost_dir => vhost_dir } + replacements = { + :user => ENV['DEPLOY_USER'], + :vhost_dir => ENV['VHOST_DIR'] + } daemon_name = File.basename(script_file, '-debian.ugly') replacements.update(:daemon_name => "foi-#{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 -- cgit v1.2.3 From 6c022353806a8505a93dcfcde1cd29d5199332d8 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 25 Jun 2014 16:51:20 +0100 Subject: Generate alert-tracks pid & log to default location Deployment system should handle linking the original location to wherever necessary on the specific platform. --- 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 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') -- cgit v1.2.3 From ada1aeee86ced562a72f3be4bace65ba493cfdaf Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 25 Jun 2014 17:49:49 +0100 Subject: Use correct site name for alert tracks log and pid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ENV[‘SITE’] can be specified for the crontab (and elsewhere) so allow the option here too. --- lib/tasks/config_files.rake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/tasks/config_files.rake') 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')) -- cgit v1.2.3 From efa7f24c08c0cffa373b44ec4745a698003f85f2 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Thu, 7 Aug 2014 12:14:05 +0100 Subject: Tidy config_files:convert_init_script --- lib/tasks/config_files.rake | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'lib/tasks/config_files.rake') diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake index 438b63fc0..8ebd3fc07 100644 --- a/lib/tasks/config_files.rake +++ b/lib/tasks/config_files.rake @@ -28,22 +28,23 @@ namespace :config_files do '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'), - :site => site + :vcspath => ENV.fetch('VCSPATH'), { 'alaveteli' }, + :site => ENV.fetch('SITE') { 'foi' } } - daemon_name = File.basename(script_file, '-debian.ugly') - 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')) + # Use the filename for the $daemon_name ugly variable + daemon_name = File.basename(ENV['SCRIPT_FILE'], '-debian.ugly') + replacements.update(:daemon_name => "#{ replacements[:site] }-#{ daemon_name }") + + # Generate the template for potential further processing + converted = convert_ugly(ENV['SCRIPT_FILE'], replacements) - unless File.exists?(rails_env_file) + # gsub the RAILS_ENV in to the generated template if its not set by the + # hard coded config file + unless File.exists?("#{ Rails.root }/config/rails_env.rb") 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") -- cgit v1.2.3 From 792d761f86df2785c91a83747397b9066dd5df0d Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Thu, 7 Aug 2014 12:30:19 +0100 Subject: Fix typo in config_files:convert_init_script --- lib/tasks/config_files.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tasks/config_files.rake') diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake index 8ebd3fc07..5dda64a04 100644 --- a/lib/tasks/config_files.rake +++ b/lib/tasks/config_files.rake @@ -31,7 +31,7 @@ namespace :config_files do replacements = { :user => ENV['DEPLOY_USER'], :vhost_dir => ENV['VHOST_DIR'], - :vcspath => ENV.fetch('VCSPATH'), { 'alaveteli' }, + :vcspath => ENV.fetch('VCSPATH') { 'alaveteli' }, :site => ENV.fetch('SITE') { 'foi' } } -- cgit v1.2.3