diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-22 01:08:48 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-22 01:08:48 +0000 |
| commit | 5173baa0046b6656dcbb52bf5447a0de3749fd6a (patch) | |
| tree | 990b4667f9b065f4b9f3c634cf93424ab43473dd /doc | |
| parent | 70387c9536e0fd598d38e9b3e57d437ccd37af1d (diff) | |
| parent | 21eecf4dda85b270749284d1c537c9d2a07b09af (diff) | |
| download | gitlab-ce-5173baa0046b6656dcbb52bf5447a0de3749fd6a.tar.gz | |
Merge branch 'backup-restore-docs-update' into 'master'
Reword backup & restore secrets description
See merge request !10753
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/raketasks/backup_restore.md | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index 65fcfc77ab1..e680a560888 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -18,10 +18,12 @@ another is through backup restore. To restore a backup, you will also need to restore `/etc/gitlab/gitlab-secrets.json` (for omnibus packages) or `/home/git/gitlab/.secret` (for installations -from source). This file contains the database encryption key and CI secret -variables used for two-factor authentication. If you fail to restore this -encryption key file along with the application data backup, users with two-factor -authentication enabled will lose access to your GitLab server. +from source). This file contains the database encryption key, +[CI secret variables](../ci/variables/README.md#secret-variables), and +secret variables used for [two-factor authentication](../security/two_factor_authentication.md). +If you fail to restore this encryption key file along with the application data +backup, users with two-factor authentication enabled and GitLab Runners will +lose access to your GitLab server. ## Create a backup of the GitLab system |