diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-04 15:41:37 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-04 15:41:37 +0100 |
| commit | 2785a56e7d1968dfda03850a14af296d71b06503 (patch) | |
| tree | 80365993d85e9d4742f20a7ffd872315d31f6e3e | |
| parent | c19fa02fa020d4b7aa69b3bbc51a4a257163325b (diff) | |
| download | gitlab-ce-decouple-secret-keys.tar.gz | |
Mention that gitlab.rb must be kept, toodecouple-secret-keys
| -rw-r--r-- | doc/raketasks/backup_restore.md | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index 40cc21f8f89..835af5443a3 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -14,10 +14,10 @@ another is through backup restore. You need to keep separate copies of `/etc/gitlab/gitlab-secrets.json` and `/etc/gitlab/gitlab.rb` (for omnibus packages) or `/home/git/gitlab/config/secrets.yml` (for installations from source). This file -contains the database encryption keys used for two-factor authentication and -project import credentials, among other things. If you restore a GitLab backup -without restoring the database encryption key, users who have two-factor -authentication enabled will lose access to your GitLab server. +contains the database encryption keys used for two-factor authentication and CI +secret variables, among other things. If you restore a GitLab backup without +restoring the database encryption key, users who have two-factor authentication +enabled will lose access to your GitLab server. ``` # use this command if you've installed GitLab with the Omnibus package @@ -224,9 +224,10 @@ If you use an Omnibus package please see the [instructions in the readme to back If you have a cookbook installation there should be a copy of your configuration in Chef. If you have an installation from source, please consider backing up your `config/secrets.yml` file, `gitlab.yml` file, any SSL keys and certificates, and your [SSH host keys](https://superuser.com/questions/532040/copy-ssh-keys-from-one-server-to-another-server/532079#532079). -At the very **minimum** you should backup `/etc/gitlab/gitlab-secrets.json` -(Omnibus) or `/home/git/gitlab/config/secrets.yml` (source) to preserve your -database encryption key. +At the very **minimum** you should backup `/etc/gitlab/gitlab.rb` and +`/etc/gitlab/gitlab-secrets.json` (Omnibus), or +`/home/git/gitlab/config/secrets.yml` (source) to preserve your database +encryption key. ## Restore a previously created backup @@ -242,10 +243,10 @@ All existing data will be either erased (SQL) or moved to a separate directory (repositories, uploads). If some or all of your GitLab users are using two-factor authentication (2FA) -then you must also make sure to restore `/etc/gitlab/gitlab-secrets.json` -(Omnibus) or `/home/git/gitlab/config/secrets.yml` (installations from -source). Note that you need to run `gitlab-ctl reconfigure` after changing -`gitlab-secrets.json`. +then you must also make sure to restore `/etc/gitlab/gitlab.rb` and +`/etc/gitlab/gitlab-secrets.json` (Omnibus), or +`/home/git/gitlab/config/secrets.yml` (installations from source). Note that you +need to run `gitlab-ctl reconfigure` after changing `gitlab-secrets.json`. ### Installation from source |