Commit bb716181 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs-abuerer-reword-default-users-for-password-hash' into 'master'

Reword default users to avoid confusion

See merge request gitlab-org/gitlab!37958
parents 4dd479c5 d106aa11
...@@ -97,7 +97,7 @@ This is why you will need: ...@@ -97,7 +97,7 @@ This is why you will need:
When using default setup, minimum configuration requires: When using default setup, minimum configuration requires:
- `CONSUL_USERNAME`. Defaults to `gitlab-consul` - `CONSUL_USERNAME`. The default user for Omnibus GitLab is `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:
...@@ -140,7 +140,7 @@ server nodes. ...@@ -140,7 +140,7 @@ server nodes.
We will need the following password information for the application's database user: We will need the following password information for the application's database user:
- `POSTGRESQL_USERNAME`. Defaults to `gitlab` - `POSTGRESQL_USERNAME`. The default user for Omnibus GitLab is `gitlab`
- `POSTGRESQL_USER_PASSWORD`. The password for the database user - `POSTGRESQL_USER_PASSWORD`. The password for the database user
- `POSTGRESQL_PASSWORD_HASH`. This is a hash generated out of the username/password pair. - `POSTGRESQL_PASSWORD_HASH`. This is a hash generated out of the username/password pair.
Can be generated with: Can be generated with:
...@@ -153,7 +153,7 @@ We will need the following password information for the application's database u ...@@ -153,7 +153,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_USERNAME`. The default user for Omnibus GitLab is `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