Download as
Browse Code »

Commit 67ef96ea5f721cc620f3e931f05d918c904ec74e

Authored by Dmitriy Zaporozhets
2 parents 18f83016 ec01cbef
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1129 from meskyanichi/master 

Potential solution for current `rake gitlab:app:backup_restore` issues.
Showing 1 changed file with 4 additions and 2 deletions   Show diff stats
lib/tasks/gitlab/backup.rake
  Diff comments   View file @67ef96e
@@ -121,7 +121,7 @@ namespace :gitlab do @@ -121,7 +121,7 @@ namespace :gitlab do
121 backup_path_repo = File.join(Gitlab.config.backup_path, "repositories") 121 backup_path_repo = File.join(Gitlab.config.backup_path, "repositories")
122 FileUtils.mkdir_p(backup_path_repo) until Dir.exists?(backup_path_repo) 122 FileUtils.mkdir_p(backup_path_repo) until Dir.exists?(backup_path_repo)
123 puts "Dumping repositories:" 123 puts "Dumping repositories:"
124 - project = Project.all.map { |n| [n.name,n.path_to_repo] } 124 + project = Project.all.map { |n| [n.path,n.path_to_repo] }
125 project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")] 125 project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")]
126 project.each do |project| 126 project.each do |project|
127 print "- Dumping repository #{project.first}... " 127 print "- Dumping repository #{project.first}... "
@@ -136,12 +136,14 @@ namespace :gitlab do @@ -136,12 +136,14 @@ namespace :gitlab do
136 task :repo_restore => :environment do 136 task :repo_restore => :environment do
137 backup_path_repo = File.join(Gitlab.config.backup_path, "repositories") 137 backup_path_repo = File.join(Gitlab.config.backup_path, "repositories")
138 puts "Restoring repositories:" 138 puts "Restoring repositories:"
139 - project = Project.all.map { |n| [n.name,n.path_to_repo] } 139 + project = Project.all.map { |n| [n.path,n.path_to_repo] }
140 project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")] 140 project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")]
141 project.each do |project| 141 project.each do |project|
142 print "- Restoring repository #{project.first}... " 142 print "- Restoring repository #{project.first}... "
143 FileUtils.rm_rf(project.second) if File.dirname(project.second) # delet old stuff 143 FileUtils.rm_rf(project.second) if File.dirname(project.second) # delet old stuff
144 if Kernel.system("cd #{File.dirname(project.second)} > /dev/null 2>&1 && git clone --bare #{backup_path_repo}/#{project.first}.bundle #{project.first}.git > /dev/null 2>&1") 144 if Kernel.system("cd #{File.dirname(project.second)} > /dev/null 2>&1 && git clone --bare #{backup_path_repo}/#{project.first}.bundle #{project.first}.git > /dev/null 2>&1")
  145 + Kernel.system("sudo chmod -R g+rwX #{Gitlab.config.git_base_path}")
  146 + Kernel.system("sudo chown -R #{Gitlab.config.ssh_user}:#{Gitlab.config.ssh_user} #{Gitlab.config.git_base_path}")
145 puts "[DONE]".green 147 puts "[DONE]".green
146 else 148 else
147 puts "[FAILED]".red 149 puts "[FAILED]".red