kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '1392-honor-database-password' into 'master'

Browse source 
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
This commit is contained in:
Achilleas Pipinellis 2016-12-09 08:29:15 +00:00
commit ab04e6c8cd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/administration/high_availability/database.md
View file

@ -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