summaryrefslogtreecommitdiff
path: root/lib/backup
diff options
context:
space:
mode:
authorAngus MacArthur <amacarthur@blackberry.com>2013-05-29 15:19:23 -0400
committerAngus MacArthur <amacarthur@blackberry.com>2013-05-30 09:58:36 -0400
commit9c82bca5ee274d700ec3166d4521d4c6d2ff896c (patch)
treebae3e3e7f91e4f3fe1b757a3504a33eb8ea63fdb /lib/backup
parent6393757707d5686b79be789303cd7cdbbf09cb11 (diff)
downloadgitlab-ce-9c82bca5ee274d700ec3166d4521d4c6d2ff896c.tar.gz
fixes for gitlab restore with non-standard backup and repo dirs
These fixes will allow a restore of gitlab when the backups and repositories directories are in non-standard locations (ie sub-dirs of gitlabhq). Also allows the restore to be run from script overriding the need of a user to confirm the rebuild of the authorized_keys file.
Diffstat (limited to 'lib/backup')
-rw-r--r--lib/backup/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 62a510f2acc..c5e3d049fd7 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -71,7 +71,7 @@ module Backup
print 'Put GitLab hooks in repositories dirs'.yellow
gitlab_shell_user_home = File.expand_path("~#{Gitlab.config.gitlab_shell.ssh_user}")
- if system("#{gitlab_shell_user_home}/gitlab-shell/support/rewrite-hooks.sh")
+ if system("#{gitlab_shell_user_home}/gitlab-shell/support/rewrite-hooks.sh #{Gitlab.config.gitlab_shell.repos_path}")
puts " [DONE]".green
else
puts " [FAILED]".red