diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-22 03:33:20 +0200 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:55:30 +0000 |
| commit | bdc7301aa448b79766fa342459aa1749deeb7b85 (patch) | |
| tree | 8311c82b65697771864c644d6b5ca3886156e0e0 /doc/pages/administration.md | |
| parent | e5c7c8ca5b56563e1c133d736eb13c87aa749fa9 (diff) | |
| download | gitlab-ce-bdc7301aa448b79766fa342459aa1749deeb7b85.tar.gz | |
Add configuration prerequisites section
[ci skip]
Diffstat (limited to 'doc/pages/administration.md')
| -rw-r--r-- | doc/pages/administration.md | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md index ad9c04a64bb..7bdd331df65 100644 --- a/doc/pages/administration.md +++ b/doc/pages/administration.md @@ -27,6 +27,7 @@ probably want to read the [user documentation](README.md). - [The GitLab Pages daemon and the case of custom domains](#the-gitlab-pages-daemon-and-the-case-of-custom-domains) - [Install the Pages daemon](#install-the-pages-daemon) - [Configuration](#configuration) + - [Configuration prerequisites](#configuration-prerequisites) - [Configuration scenarios](#configuration-scenarios) - [DNS configuration](#dns-configuration) - [Setting up GitLab Pages](#setting-up-gitlab-pages) @@ -108,13 +109,13 @@ The `gitlab-pages` daemon is included in the Omnibus package. ## Configuration There are multiple ways to set up GitLab Pages according to what URL scheme you -are willing to support. Below you will find all possible scenarios to choose -from. +are willing to support. -### Configuration scenarios +### Configuration prerequisites -Before proceeding with setting up GitLab Pages, you have to decide which route -you want to take. Note that in either scenario, you need: +In the next section you will find all possible scenarios to choose from. + +In either scenario, you will need: 1. To use the [GitLab Pages daemon](#the-gitlab-pages-daemon) 1. A separate domain @@ -125,6 +126,11 @@ you want to take. Note that in either scenario, you need: 1. (Optional but recommended) [Shared runners](../ci/runners/README.md) so that your users don't have to bring their own +### Configuration scenarios + +Before proceeding with setting up GitLab Pages, you have to decide which route +you want to take. + The possible scenarios are depicted in the table below. | URL scheme | Option | Wildcard certificate | Custom domain with HTTP support | Custom domain with HTTPS support | Secondary IP | |