diff options
Diffstat (limited to 'doc/administration/encrypted_configuration.md')
| -rw-r--r-- | doc/administration/encrypted_configuration.md | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/doc/administration/encrypted_configuration.md b/doc/administration/encrypted_configuration.md index 1ddf2951f70..808967778fa 100644 --- a/doc/administration/encrypted_configuration.md +++ b/doc/administration/encrypted_configuration.md @@ -19,22 +19,14 @@ GitLab can read settings for certain features from encrypted settings files. The To enable the encrypted configuration settings, a new base key must be generated for `encrypted_settings_key_base`. The secret can be generated in the following ways: -**Omnibus** +- For Linux package installations, the new secret is automatically generated for you, but you must ensure your + `/etc/gitlab/gitlab-secrets.json` contains the same values on all nodes. +- For Helm chart installations, the new secret is automatically generated if you have the `shared-secrets` chart enabled. + Otherwise, you need to follow the [secrets guide for adding the secret](https://docs.gitlab.com/charts/installation/secrets.html#gitlab-rails-secret). +- For self-compiled installations, the new secret can be generated by running: -Starting with 13.7 the new secret is automatically generated for you, but you must ensure your -`/etc/gitlab/gitlab-secrets.json` contains the same values on all nodes. + ```shell + bundle exec rake gitlab:env:info RAILS_ENV=production GITLAB_GENERATE_ENCRYPTED_SETTINGS_KEY_BASE=true + ``` -**Helm chart** - -Starting with GitLab 13.7, the new secret is automatically generated if you have the `shared-secrets` chart enabled. Otherwise, you need -to follow the [secrets guide for adding the secret](https://docs.gitlab.com/charts/installation/secrets.html#gitlab-rails-secret). - -**Source** - -The new secret can be generated by running: - -```shell -bundle exec rake gitlab:env:info RAILS_ENV=production GITLAB_GENERATE_ENCRYPTED_SETTINGS_KEY_BASE=true -``` - -This prints general information on the GitLab instance, but also causes the key to be generated in `<path-to-gitlab-rails>/config/secrets.yml`. + This prints general information on the GitLab instance and generates the key in `<path-to-gitlab-rails>/config/secrets.yml`. |