summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Lewis <mlewis@gitlab.com>2019-06-04 04:06:23 +0000
committerMike Lewis <mlewis@gitlab.com>2019-06-04 04:06:23 +0000
commitf4c32540d2234c84ea618979f2dfd1dc23cd5643 (patch)
treed9b43ebd0ace8c35ed867d7a159800846d7276ea
parent9a9c947b145e6a43ae49687aa398d1154d07a25b (diff)
parent7c60c4be652ff81656663f71352e7b4856939bcd (diff)
downloadgitlab-ce-f4c32540d2234c84ea618979f2dfd1dc23cd5643.tar.gz
Merge branch 'docs-aws-elb-web-terminals' into 'master'
Add documentation about AWS ELB not supporting web sockets See merge request gitlab-org/gitlab-ce!28030
-rw-r--r--doc/administration/integration/terminal.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md
index 2596e3fe68b..c34858cd0db 100644
--- a/doc/administration/integration/terminal.md
+++ b/doc/administration/integration/terminal.md
@@ -43,6 +43,11 @@ detail below.
## Enabling and disabling terminal support
+NOTE: **Note:** AWS Elastic Load Balancers (ELBs) do not support web sockets.
+AWS Application Load Balancers (ALBs) must be used if you want web terminals
+to work. See [AWS Elastic Load Balancing Product Comparison](https://aws.amazon.com/elasticloadbalancing/features/#compare)
+for more information.
+
As web terminals use WebSockets, every HTTP/HTTPS reverse proxy in front of
Workhorse needs to be configured to pass the `Connection` and `Upgrade` headers
through to the next one in the chain. If you installed GitLab using Omnibus, or