diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-22 03:27:44 +0200 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:55:30 +0000 |
| commit | e5c7c8ca5b56563e1c133d736eb13c87aa749fa9 (patch) | |
| tree | 796c7968574a4b5738326041b4df65b81e9718bd /doc/pages/administration.md | |
| parent | 9ca234615e44e2b365b8d6c1cc5a91c5bdd7159d (diff) | |
| download | gitlab-ce-e5c7c8ca5b56563e1c133d736eb13c87aa749fa9.tar.gz | |
Small reword fixes
Diffstat (limited to 'doc/pages/administration.md')
| -rw-r--r-- | doc/pages/administration.md | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md index 4aaabdb3442..ad9c04a64bb 100644 --- a/doc/pages/administration.md +++ b/doc/pages/administration.md @@ -48,7 +48,7 @@ probably want to read the [user documentation](README.md). ## The GitLab Pages daemon -Starting from GitLab EE 8.5, Pages make use of a separate tool ([gitlab-pages]), +Starting from GitLab EE 8.5, GitLab Pages make use of the [GitLab Pages daemon], a simple HTTP server written in Go that can listen on an external IP address and provide support for custom domains and custom certificates. The GitLab Pages Daemon supports dynamic certificates through SNI and exposes pages using @@ -65,6 +65,9 @@ Here is a brief list with what it is supported when using the pages daemon: You are encouraged to read its [README][pages-readme] to fully understand how it works. +[gitlab pages daemon]: https://gitlab.com/gitlab-org/gitlab-pages +[pages-readme]: https://gitlab.com/gitlab-org/gitlab-pages/blob/master/README.md + ### The GitLab Pages daemon and the case of custom domains In the case of custom domains, the Pages daemon needs to listen on ports `80` @@ -87,7 +90,7 @@ install the pages daemon. ### Install the Pages daemon -**Install the Pages daemon on a source installation** +**Source installations** ``` cd /home/git @@ -97,11 +100,10 @@ sudo -u git -H git checkout 0.2.0 sudo -u git -H make ``` -**Install the Pages daemon on Omnibus** +**Omnibus installations** The `gitlab-pages` daemon is included in the Omnibus package. -[pages-readme]: https://gitlab.com/gitlab-org/gitlab-pages/blob/master/README.md ## Configuration |