Commit 35bda8f0 authored by Richard Clamp's avatar Richard Clamp

Introduce default usernames earlier

`CONSUL_USERNAME` and `PGBOUNCER_USERNAME` are used to derive
`CONSUL_PASSWORD_HASH` and `PGBOUNCER_PASSWORD_HASH`, so we should let
the user know their default values so we're not expecting them to jump
forward to the notes on the service.

https://gitlab.com/gitlab-org/build/team-tasks/issues/34
parent 9c97a635
...@@ -70,6 +70,7 @@ information you need to provide. ...@@ -70,6 +70,7 @@ information you need to provide.
When using default setup, minimum configuration requires: When using default setup, minimum configuration requires:
- `CONSUL_USERNAME`. Defaults to `gitlab-consul`
- `CONSUL_DATABASE_PASSWORD`. Password for the database user. - `CONSUL_DATABASE_PASSWORD`. Password for the database user.
- `CONSUL_PASSWORD_HASH`. This is a hash generated out of consul username/password pair. - `CONSUL_PASSWORD_HASH`. This is a hash generated out of consul username/password pair.
Can be generated with: Can be generated with:
...@@ -119,6 +120,7 @@ We will need the following password information for the application's database u ...@@ -119,6 +120,7 @@ We will need the following password information for the application's database u
When using default setup, minimum configuration requires: When using default setup, minimum configuration requires:
- `PGBOUNCER_USERNAME`. Defaults to `pgbouncer`
- `PGBOUNCER_PASSWORD`. This is a password for pgbouncer service. - `PGBOUNCER_PASSWORD`. This is a password for pgbouncer service.
- `PGBOUNCER_PASSWORD_HASH`. This is a hash generated out of pgbouncer username/password pair. - `PGBOUNCER_PASSWORD_HASH`. This is a hash generated out of pgbouncer username/password pair.
Can be generated with: Can be generated with:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment