Commit 9f620473 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'update-ha-md5-instructions-docs' into 'master'

Update PG HA documentation

Closes omnibus-gitlab#3018

See merge request gitlab-org/gitlab-ee!4803
parents 9270cc24 0ede8899
...@@ -117,7 +117,7 @@ When using default setup, minimum configuration requires: ...@@ -117,7 +117,7 @@ When using default setup, minimum configuration requires:
- `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:
```sh ```sh
echo -n 'CONSUL_DATABASE_PASSWORDCONSUL_USERNAME' | md5sum sudo gitlab-ctl pg-password-md5 CONSUL_USERNAME
``` ```
- `CONSUL_SERVER_NODES`. The IP addresses or DNS records of the Consul server nodes. - `CONSUL_SERVER_NODES`. The IP addresses or DNS records of the Consul server nodes.
...@@ -159,7 +159,7 @@ We will need the following password information for the application's database u ...@@ -159,7 +159,7 @@ We will need the following password information for the application's database u
- `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:
```sh ```sh
echo -n 'POSTGRESQL_USER_PASSWORDPOSTGRESQL_USERNAME' | md5sum sudo gitlab-ctl pg-password-md5 POSTGRESQL_USERNAME
``` ```
##### Pgbouncer information ##### Pgbouncer information
...@@ -171,7 +171,7 @@ When using default setup, minimum configuration requires: ...@@ -171,7 +171,7 @@ When using default setup, minimum configuration requires:
- `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:
```sh ```sh
echo -n 'PGBOUNCER_PASSWORDPGBOUNCER_USERNAME' | md5sum sudo gitlab-ctl pg-password-md5 PGBOUNCER_USERNAME
``` ```
- `PGBOUNCER_NODE`, is the IP address or a FQDN of the node running Pgbouncer. - `PGBOUNCER_NODE`, is the IP address or a FQDN of the node running Pgbouncer.
...@@ -228,7 +228,7 @@ On each Consul node perform the following: ...@@ -228,7 +228,7 @@ On each Consul node perform the following:
server: true, server: true,
retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z) retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z)
} }
# Disable auto migrations # Disable auto migrations
gitlab_rails['auto_migrate'] = false gitlab_rails['auto_migrate'] = false
# #
......
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