summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2015-08-04 21:56:27 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2015-08-04 21:56:27 +0000
commit4c9ba632e9468a0a8f37a031d0be90645ee6be2c (patch)
treea6add397761f019398b4d189615d8bf84088a503
parent88a3cfe1070bbd7db450f68b8fc2b509c795e413 (diff)
parent70410fb6bc7ae475461361a7fe526d8c76601ec2 (diff)
downloadgitlab-ce-4c9ba632e9468a0a8f37a031d0be90645ee6be2c.tar.gz
Merge branch 'master' into 'master'
updated restore docs wrt backup location [ci skip] Made sure to point out that the restore location can be overwritten by an entry in the config. See merge request !1030
-rw-r--r--doc/raketasks/backup_restore.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 05324b33022..c095ae48dc3 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -249,7 +249,7 @@ Deleting tmp directories...[DONE]
We will assume that you have installed GitLab from an omnibus package and run
`sudo gitlab-ctl reconfigure` at least once.
-First make sure your backup tar file is in `/var/opt/gitlab/backups`.
+First make sure your backup tar file is in `/var/opt/gitlab/backups` (or wherever `gitlab_rails['backup_path']` points to).
```shell
sudo cp 1393513186_gitlab_backup.tar /var/opt/gitlab/backups/
@@ -369,4 +369,4 @@ For more information see similar questions on postgresql issue tracker[here](htt
## Note
This documentation is for GitLab CE.
-We backup GitLab.com and make sure your data is secure, but you can't use these methods to export / backup your data yourself from GitLab.com.
+We backup GitLab.com and make sure your data is secure, but you can't use these methods to export / backup your data yourself from GitLab.com. \ No newline at end of file