diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-12-09 08:29:15 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-12-09 08:29:15 +0000 |
| commit | ab04e6c8cd43b6c5ca8e28e3c83acd3a610baaee (patch) | |
| tree | 03fda3b92f6cdefa17769a645e733fb430b5cbf1 | |
| parent | b40c26b59dd2bebb4dd5af6f62438d92cc16f58c (diff) | |
| parent | 44b082c7cce6d2a48c1511b5ffacd2d41671bad1 (diff) | |
| download | gitlab-ce-ab04e6c8cd43b6c5ca8e28e3c83acd3a610baaee.tar.gz | |
Merge branch '1392-honor-database-password' into 'master'
Updating reference to database password
## What does this MR do?
Updates references to postgresql['sql_password'] to use gitlab_rails['db_password'] instead. Original value is not used anywhere. For gitlab-org/omnibus-gitlab#1392 we're using gitlab_rails['db_password'] to create a .pgpass as needed.
See merge request !8000
| -rw-r--r-- | doc/administration/high_availability/database.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/high_availability/database.md b/doc/administration/high_availability/database.md index 76f3a0fb387..b36cf18d459 100644 --- a/doc/administration/high_availability/database.md +++ b/doc/administration/high_availability/database.md @@ -41,7 +41,7 @@ If you use a cloud-managed service, or provide your own PostgreSQL: mailroom['enable'] = false # PostgreSQL configuration - postgresql['sql_password'] = 'DB password' + gitlab_rails['db_password'] = 'DB password' postgresql['md5_auth_cidr_addresses'] = ['0.0.0.0/0'] postgresql['listen_address'] = '0.0.0.0' ``` @@ -80,7 +80,7 @@ If you use a cloud-managed service, or provide your own PostgreSQL: 1. Similarly, set the password for the `gitlab` database user. Use the same password that you specified in the `/etc/gitlab/gitlab.rb` file for - `postgresql['sql_password']`. + `gitlab_rails['db_password']`. ``` \password gitlab |