Skip to content
Snippets Groups Projects
Commit 1505cd44 authored by Evan Read's avatar Evan Read
Browse files

Merge branch 'calebw-master-patch-56598' into 'master'

Removes note and link to closed gitaly issue

See merge request gitlab-org/omnibus-gitlab!4679
parents db485c3c a4398c07
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -28,8 +28,7 @@ might be required if you are behind a proxy:
# Needed for proxying Git clones
gitaly['env'] = {
"http_proxy" => "http://USERNAME:PASSWORD@example.com:8080",
"https_proxy" => "http://USERNAME:PASSWORD@example.com:8080",
"no_proxy" => "unix" # Workaround for https://gitlab.com/gitlab-org/gitaly/-/issues/1447
"https_proxy" => "http://USERNAME:PASSWORD@example.com:8080"
}
 
gitlab_workhorse['env'] = {
Loading
Loading
@@ -49,14 +48,6 @@ registry['env'] = {
}
```
 
NOTE: **Note:**
The `no_proxy` entry for Gitaly is needed in GitLab 11.6
and newer if a proxy is defined and Gitaly is listening on a UNIX
socket, which it is by default. It appears to be a limitation in the
gRPC client library. See [the Gitaly
issue](https://gitlab.com/gitlab-org/gitaly/-/issues/1447) for more
details.
NOTE: **Note:**
GitLab 11.6 and newer will attempt to use HTTP Basic
Authentication when a username and password is included in the proxy
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment