Commit 18a4fb0a authored by Evan Read's avatar Evan Read

Merge branch 'gitaly-update-tls-config' into 'master'

Documentation: Clarify TLS config for praefect and gitaly

See merge request gitlab-org/gitlab!80653
parents da0a7d2e 3cac72e6
...@@ -597,8 +597,8 @@ On the **Praefect** node: ...@@ -597,8 +597,8 @@ On the **Praefect** node:
Praefect supports TLS encryption. To communicate with a Praefect instance that listens Praefect supports TLS encryption. To communicate with a Praefect instance that listens
for secure connections, you must: for secure connections, you must:
- Use a `tls://` URL scheme in the `gitaly_address` of the corresponding storage entry - Ensure Gitaly is [configured for TLS](configure_gitaly.md#enable-tls-support) and use a `tls://` URL scheme in the `gitaly_address`
in the GitLab configuration. of the corresponding storage entry in the GitLab configuration.
- Bring your own certificates because this isn't provided automatically. The certificate - Bring your own certificates because this isn't provided automatically. The certificate
corresponding to each Praefect server must be installed on that Praefect server. corresponding to each Praefect server must be installed on that Praefect server.
...@@ -666,7 +666,7 @@ To configure Praefect with TLS: ...@@ -666,7 +666,7 @@ To configure Praefect with TLS:
```ruby ```ruby
git_data_dirs({ git_data_dirs({
"default" => { "default" => {
"gitaly_address" => 'tls://PRAEFECT_LOADBALANCER_HOST:2305', "gitaly_address" => 'tls://PRAEFECT_LOADBALANCER_HOST:3305',
"gitaly_token" => 'PRAEFECT_EXTERNAL_TOKEN' "gitaly_token" => 'PRAEFECT_EXTERNAL_TOKEN'
} }
}) })
...@@ -984,7 +984,10 @@ Particular attention should be shown to: ...@@ -984,7 +984,10 @@ Particular attention should be shown to:
balancer. balancer.
- `PRAEFECT_EXTERNAL_TOKEN` with the real secret - `PRAEFECT_EXTERNAL_TOKEN` with the real secret
If you are using TLS, the `gitaly_address` should begin with `tls://`. If you are using TLS:
- The `gitaly_address` should begin with `tls://` instead.
- The port should be changed to `3305`.
```ruby ```ruby
git_data_dirs({ git_data_dirs({
......
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