Download as
Browse Code »

Commit 3b814b256441be6e0fc98cb1afa695c4f13d6849

Authored by Athos
1 parent 85b736c8
Exists in master and in 26 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Fix backup task 

- Adds host option to the postgres commands where necessary.
- Passes -h option to tar when compressing in order to follow symlinks.

Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com>
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Showing 1 changed file with 6 additions and 4 deletions   Show diff stats
lib/tasks/backup.rake
  Diff comments   View file @3b814b2
@@ -25,9 +25,10 @@ task :backup =&gt; :check_backup_support do @@ -25,9 +25,10 @@ task :backup =&gt; :check_backup_support do
25 dump = File.join('tmp/backup', backup_name) + '.sql' 25 dump = File.join('tmp/backup', backup_name) + '.sql'
26 26
27 database = $config['production']['database'] 27 database = $config['production']['database']
28 - sh "pg_dump #{database} > #{dump}" 28 + host = $config['production']['host']
  29 + sh "pg_dump -h #{host} #{database} > #{dump}"
29 30
30 - sh 'tar', 'caf', backup_file, dump, *dirs 31 + sh 'tar', 'chaf', backup_file, dump, *dirs
31 rm_f dump 32 rm_f dump
32 33
33 puts "****************************************************" 34 puts "****************************************************"
@@ -81,14 +82,15 @@ task :restore =&gt; :check_backup_support do @@ -81,14 +82,15 @@ task :restore =&gt; :check_backup_support do
81 82
82 database = $config['production']['database'] 83 database = $config['production']['database']
83 username = $config['production']['username'] 84 username = $config['production']['username']
  85 + host = $config['production']['host']
84 86
85 puts "WARNING: backups should be restored to an empty database, otherwise" 87 puts "WARNING: backups should be restored to an empty database, otherwise"
86 puts "data from the backup may not be loaded properly." 88 puts "data from the backup may not be loaded properly."
87 puts 89 puts
88 puts 'You can remove the existing database and create a new one with:' 90 puts 'You can remove the existing database and create a new one with:'
89 puts 91 puts
90 - puts "$ sudo -u postgres dropdb #{database}"  
91 - puts "$ sudo -u postgres createdb #{database} --owner #{username}" 92 + puts "$ sudo -u postgres dropdb -h #{host} #{database}"
  93 + puts "$ sudo -u postgres createdb -h #{host} #{database} --owner #{username}"
92 puts 94 puts
93 print "Are you sure you want to continue (y/N)? " 95 print "Are you sure you want to continue (y/N)? "
94 response = $stdin.gets.strip 96 response = $stdin.gets.strip