summaryrefslogtreecommitdiff
path: root/doc/pages/administration.md
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-22 01:11:36 +0200
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:29 +0000
commitca26884c1538322150c8d3e08a6f2f5295b1c725 (patch)
tree7839497dfaf3ea3359ca5bdfc1384e5aff11b692 /doc/pages/administration.md
parent54c943a59732cb0e0ce90a3d5db7f98ae807f22b (diff)
downloadgitlab-ce-ca26884c1538322150c8d3e08a6f2f5295b1c725.tar.gz
Add info about the loadbalancer
Diffstat (limited to 'doc/pages/administration.md')
-rw-r--r--doc/pages/administration.md12
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md
index 8477bfa8b21..c009263f648 100644
--- a/doc/pages/administration.md
+++ b/doc/pages/administration.md
@@ -67,12 +67,18 @@ and/or `443`. For that reason, there is some flexibility in the way which you
can set it up, so you basically have three choices:
1. Run the pages daemon in the same server as GitLab, listening on a secondary IP
-1. Run the pages daemon in the same server as GitLab, listening on the same IP
- but on different ports. In that case, you will have to proxy the traffic with
- a loadbalancer.
1. Run the pages daemon in a separate server. In that case, the Pages [`path`]
must also be present in the server that the pages daemon is installed, so
you will have to share it via network.
+1. Run the pages daemon in the same server as GitLab, listening on the same IP
+ but on different ports. In that case, you will have to proxy the traffic with
+ a loadbalancer. If you choose that route note that you should use TCP load
+ balancing for HTTPS. If you use TLS-termination (HTTPS-load balancing) the
+ pages will not be able to be served with user provided certificates. For
+ HTTP it's OK to use HTTP or TCP load balancing.
+
+In this document, we will proceed assuming the first option. First let's
+install the pages daemon.
[`path`]: https://gitlab.com/gitlab-org/gitlab-ee/blob/8-5-stable-ee/config/gitlab.yml.example#L155