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

Merge branch '1392-honor-database-password' into 'master'
ab04e6c8 · Achilleas Pipinellis · b40c26b5 · 44b082c7 · ab04e6c8
Commit ab04e6c8 authored Dec 09, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

database.md doc/administration/high_availability/database.md +2 -2

No files found.
--- 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