diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 03:09:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 03:09:28 +0000 |
| commit | be2f4c5788975597dd7be1c8a3525549770c1216 (patch) | |
| tree | 083ed0d7e29e26d479c00e00d9cb89d74ebbb0ef /doc/administration/pages/source.md | |
| parent | 2711c26beaca6c3a5a3be4b65e01557faf0185b6 (diff) | |
| download | gitlab-ce-be2f4c5788975597dd7be1c8a3525549770c1216.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/pages/source.md')
| -rw-r--r-- | doc/administration/pages/source.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/pages/source.md b/doc/administration/pages/source.md index 3e5a82030a2..87f0afeca12 100644 --- a/doc/administration/pages/source.md +++ b/doc/administration/pages/source.md @@ -35,7 +35,7 @@ which you can set it up: 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 + a load balancer. 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. @@ -51,7 +51,7 @@ Before proceeding with the Pages configuration, make sure that: this document we assume that to be `example.io`. 1. You have configured a **wildcard DNS record** for that domain. 1. You have installed the `zip` and `unzip` packages in the same server that - GitLab is installed since they are needed to compress/uncompress the + GitLab is installed since they are needed to compress and decompress the Pages artifacts. 1. (Optional) You have a **wildcard certificate** for the Pages domain if you decide to serve Pages (`*.example.io`) under HTTPS. @@ -388,7 +388,7 @@ Each request to view a resource in a private site is authenticated by Pages using that token. For each request it receives, it makes a request to the GitLab API to check that the user is authorized to read that site. -From [GitLab 12.8](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/3689) onwards, +From [GitLab 12.8](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/3689) onward, Access Control parameters for Pages are set in a configuration file, which by convention is named `gitlab-pages-config`. The configuration file is passed to pages using the `-config flag` or CONFIG environment variable. |