Commit ec01cbef9452dcbe7a09f1709370a7939f66c542
1 parent
8b7e404b
Exists in
master
and in
4 other branches
Modified the `repo_dump` and `repo_restore` rake tasks to properly dump and rest…
…ore repositories based on their `path` rather than their (project) `name`. The project name can be uppercase and may contain spaces. This caused the repository to be restored as a different `path` that it was initially created as, thus, breaking the `git remote` and the web interface can no longer detect the repository either because it searches by `path` and not by `name`. Also, when restoring the permissions are incorrect making it impossible to push new commits to the remote repository. So now on success it'll set the correct permissions (but requires that the `gitlab` user has `sudo` privileges, or this task must be executed as root).
Showing
1 changed file
with
4 additions
and
2 deletions
Show diff stats
lib/tasks/gitlab/backup.rake
| @@ -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 |