Download as
Browse Code »

Commit b5fff02ebdc764821500a136bc838b5cf31513d4

Authored by Antonio Terceiro
1 parent d8943451
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

backup/restore: omit host if absent from config

Showing 1 changed file with 7 additions and 5 deletions   Show diff stats
lib/tasks/backup.rake
  Diff comments   View file @b5fff02
@@ -25,8 +25,9 @@ task :backup => :check_backup_support do @@ -25,8 +25,9 @@ task :backup => :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 - host = $config['production']['host'] || 'localhost'  
29 - sh "pg_dump -h #{host} #{database} > #{dump}" 28 + host = $config['production']['host']
  29 + host = host && "-h #{host}" || ""
  30 + sh "pg_dump #{host} #{database} > #{dump}"
30 31
31 sh 'tar', 'chaf', backup_file, dump, *dirs 32 sh 'tar', 'chaf', backup_file, dump, *dirs
32 rm_f dump 33 rm_f dump
@@ -82,15 +83,16 @@ task :restore => :check_backup_support do @@ -82,15 +83,16 @@ task :restore => :check_backup_support do
82 83
83 database = $config['production']['database'] 84 database = $config['production']['database']
84 username = $config['production']['username'] 85 username = $config['production']['username']
85 - host = $config['production']['host'] || 'localhost' 86 + host = $config['production']['host']
  87 + host = host && "-h #{host}" || ""
86 88
87 puts "WARNING: backups should be restored to an empty database, otherwise" 89 puts "WARNING: backups should be restored to an empty database, otherwise"
88 puts "data from the backup may not be loaded properly." 90 puts "data from the backup may not be loaded properly."
89 puts 91 puts
90 puts 'You can remove the existing database and create a new one with:' 92 puts 'You can remove the existing database and create a new one with:'
91 puts 93 puts
92 - puts "$ sudo -u postgres dropdb -h #{host} #{database}"  
93 - puts "$ sudo -u postgres createdb -h #{host} #{database} --owner #{username}" 94 + puts "$ sudo -u postgres dropdb #{host} #{database}"
  95 + puts "$ sudo -u postgres createdb #{host} #{database} --owner #{username}"
94 puts 96 puts
95 print "Are you sure you want to continue (y/N)? " 97 print "Are you sure you want to continue (y/N)? "
96 response = $stdin.gets.strip 98 response = $stdin.gets.strip