Download as
Browse Code »

Commit 3b814b256441be6e0fc98cb1afa695c4f13d6849

Authored by Athos
1 parent 85b736c8
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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 25 dump = File.join('tmp/backup', backup_name) + '.sql'
26 26  
27 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 32 rm_f dump
32 33  
33 34 puts "****************************************************"
... ... @@ -81,14 +82,15 @@ task :restore =&gt; :check_backup_support do
81 82  
82 83 database = $config['production']['database']
83 84 username = $config['production']['username']
  85 + host = $config['production']['host']
84 86  
85 87 puts "WARNING: backups should be restored to an empty database, otherwise"
86 88 puts "data from the backup may not be loaded properly."
87 89 puts
88 90 puts 'You can remove the existing database and create a new one with:'
89 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 94 puts
93 95 print "Are you sure you want to continue (y/N)? "
94 96 response = $stdin.gets.strip
... ...