diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-08 21:19:03 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-08 21:19:03 +0000 |
| commit | 75efb2c9afb68f722476f8843f8cf06b14863375 (patch) | |
| tree | 35710d40cdef8c93e2ccf0ba0accebe3f77d7c9e /doc/administration | |
| parent | a57a0e3d606c80fbcecd126148631dabbd44347b (diff) | |
| parent | f482f8aaebe96fe437f63d021baaca3f30c80be7 (diff) | |
| download | gitlab-ce-75efb2c9afb68f722476f8843f8cf06b14863375.tar.gz | |
Merge branch 'patch-14' into 'master'
spell out what VIP is
See merge request !9733
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/high_availability/load_balancer.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/high_availability/load_balancer.md b/doc/administration/high_availability/load_balancer.md index dad8e956c0e..3245988fc14 100644 --- a/doc/administration/high_availability/load_balancer.md +++ b/doc/administration/high_availability/load_balancer.md @@ -19,8 +19,8 @@ you need to use with GitLab. ## GitLab Pages Ports If you're using GitLab Pages you will need some additional port configurations. -GitLab Pages requires a separate VIP. Configure DNS to point the -`pages_external_url` from `/etc/gitlab/gitlab.rb` at the new VIP. See the +GitLab Pages requires a separate virtual IP address. Configure DNS to point the +`pages_external_url` from `/etc/gitlab/gitlab.rb` at the new virtual IP address. See the [GitLab Pages documentation][gitlab-pages] for more information. | LB Port | Backend Port | Protocol | @@ -32,7 +32,7 @@ GitLab Pages requires a separate VIP. Configure DNS to point the Some organizations have policies against opening SSH port 22. In this case, it may be helpful to configure an alternate SSH hostname that allows users -to use SSH on port 443. An alternate SSH hostname will require a new VIP +to use SSH on port 443. An alternate SSH hostname will require a new virtual IP address compared to the other GitLab HTTP configuration above. Configure DNS for an alternate SSH hostname such as altssh.gitlab.example.com. |