summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-10-09 09:06:10 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2017-10-09 09:06:10 +0000
commit2a9147b747ded82e0970c3f8235e9d9e27bd0ab4 (patch)
treebe1a4423491a41b6dca7730b93bc022da0f62e66
parent419b27eb983b38d45d69ee6fc8d9fc8b288e169c (diff)
parent09dbbc27070cbd6151ec87fa82ae3c77c78492e1 (diff)
downloadgitlab-ce-2a9147b747ded82e0970c3f8235e9d9e27bd0ab4.tar.gz
Merge branch '38840-simple-documentation-update-backup-to-restore-in-restore-section' into 'master'
Resolve "Simple documentation update - backup to restore in restore section" Closes #38840 See merge request gitlab-org/gitlab-ce!14720
-rw-r--r--doc/raketasks/backup_restore.md14
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index ae69d7f92f2..e4c09b2b507 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -370,7 +370,7 @@ This is recommended to reduce cron spam.
## Restore
-GitLab provides a simple command line interface to backup your whole installation,
+GitLab provides a simple command line interface to restore your whole installation,
and is flexible enough to fit your needs.
The [restore prerequisites section](#restore-prerequisites) includes crucial
@@ -445,6 +445,14 @@ Restoring repositories:
Deleting tmp directories...[DONE]
```
+Next, restore `/home/git/gitlab/.secret` if necessary as mentioned above.
+
+Restart GitLab:
+
+```shell
+sudo service gitlab restart
+```
+
### Restore for Omnibus installations
This procedure assumes that:
@@ -480,10 +488,12 @@ restore:
sudo gitlab-rake gitlab:backup:restore BACKUP=1493107454_2017_04_25_9.1.0
```
+Next, restore `/etc/gitlab/gitlab-secrets.json` if necessary as mentioned above.
+
Restart and check GitLab:
```shell
-sudo gitlab-ctl start
+sudo gitlab-ctl restart
sudo gitlab-rake gitlab:check SANITIZE=true
```