diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-10-13 12:26:59 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-10-13 12:26:59 +0000 |
| commit | 88568b8c4f33cbae8156878a61557d2720809d76 (patch) | |
| tree | 341ee55c750a8c4ad9af1cdb701aeb918a79692d | |
| parent | 8ca0387fe5caeb09f02273d96ed3e6295b02d468 (diff) | |
| parent | 3939d4dfbfda5f7bb5133e12573c80f600ce451f (diff) | |
| download | gitlab-ce-88568b8c4f33cbae8156878a61557d2720809d76.tar.gz | |
Merge branch 'ha-doc-secret-names' into 'master'
Fix secret names in HA docs
See https://gitlab.com/gitlab-org/gitlab-ee/issues/1110#note_16854559. I don't think this needs a CHANGELOG item really.
See merge request !6845
| -rw-r--r-- | doc/administration/high_availability/gitlab.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/high_availability/gitlab.md b/doc/administration/high_availability/gitlab.md index 8a881ce8863..137fed35a73 100644 --- a/doc/administration/high_availability/gitlab.md +++ b/doc/administration/high_availability/gitlab.md @@ -101,9 +101,9 @@ need some additional configuration. ```ruby gitlab_shell['secret_token'] = 'fbfb19c355066a9afb030992231c4a363357f77345edd0f2e772359e5be59b02538e1fa6cae8f93f7d23355341cea2b93600dab6d6c3edcdced558fc6d739860' - gitlab_rails['secret_token'] = 'b719fe119132c7810908bba18315259ed12888d4f5ee5430c42a776d840a396799b0a5ef0a801348c8a357f07aa72bbd58e25a84b8f247a25c72f539c7a6c5fa' - gitlab_ci['secret_key_base'] = '6e657410d57c71b4fc3ed0d694e7842b1895a8b401d812c17fe61caf95b48a6d703cb53c112bc01ebd197a85da81b18e29682040e99b4f26594772a4a2c98c6d' - gitlab_ci['db_key_base'] = 'bf2e47b68d6cafaef1d767e628b619365becf27571e10f196f98dc85e7771042b9203199d39aff91fcb6837c8ed83f2a912b278da50999bb11a2fbc0fba52964' + gitlab_rails['otp_key_base'] = 'b719fe119132c7810908bba18315259ed12888d4f5ee5430c42a776d840a396799b0a5ef0a801348c8a357f07aa72bbd58e25a84b8f247a25c72f539c7a6c5fa' + gitlab_rails['secret_key_base'] = '6e657410d57c71b4fc3ed0d694e7842b1895a8b401d812c17fe61caf95b48a6d703cb53c112bc01ebd197a85da81b18e29682040e99b4f26594772a4a2c98c6d' + gitlab_rails['db_key_base'] = 'bf2e47b68d6cafaef1d767e628b619365becf27571e10f196f98dc85e7771042b9203199d39aff91fcb6837c8ed83f2a912b278da50999bb11a2fbc0fba52964' ``` 1. Run `touch /etc/gitlab/skip-auto-migrations` to prevent database migrations |