diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-27 05:32:03 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-27 05:32:03 +0000 |
| commit | ced7212e8722266eca275c9e61bdec861c889032 (patch) | |
| tree | 418f1b8440a73f767e1a65c64489148c72ae4fae | |
| parent | 43fb9279ce39d51b1deceb5108560bf37b8d340d (diff) | |
| parent | e23441baee7cafd36f17d309880aee2aa394fb61 (diff) | |
| download | gitlab-ce-ced7212e8722266eca275c9e61bdec861c889032.tar.gz | |
Merge branch 'patch-21' into 'master'
clarify when GitLab pages requires special config for load balancer
See merge request !10954
| -rw-r--r-- | doc/administration/high_availability/load_balancer.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/high_availability/load_balancer.md b/doc/administration/high_availability/load_balancer.md index 3245988fc14..d9ca74ca1a3 100644 --- a/doc/administration/high_availability/load_balancer.md +++ b/doc/administration/high_availability/load_balancer.md @@ -18,7 +18,8 @@ you need to use with GitLab. ## GitLab Pages Ports -If you're using GitLab Pages you will need some additional port configurations. +If you're using GitLab Pages with custom domain support you will need some +additional port configurations. 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. |