summaryrefslogtreecommitdiff
path: root/doc/pages/administration.md
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2015-12-17 19:56:07 +0200
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:53:55 +0000
commit38028d92539afb70ab6c1d5ec0d03299a9d2c1db (patch)
treed85569764ea8dd950556e1e5020bb8002c9d117a /doc/pages/administration.md
parenta60f5f6cb429ff232647665ab288b3df251669e5 (diff)
downloadgitlab-ce-38028d92539afb70ab6c1d5ec0d03299a9d2c1db.tar.gz
Add example when using a subdomain [ci skip]
Diffstat (limited to 'doc/pages/administration.md')
-rw-r--r--doc/pages/administration.md16
1 files changed, 12 insertions, 4 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md
index 02e575c851a..6e242efae9f 100644
--- a/doc/pages/administration.md
+++ b/doc/pages/administration.md
@@ -45,7 +45,8 @@ See the relevant documentation at <http://doc.gitlab.com/omnibus/settings/pages.
cd /home/git/gitlab
```
-1. Edit `gitlab.yml` and under the `pages` setting, set `enabled` to `true`:
+1. Edit `gitlab.yml` and under the `pages` setting, set `enabled` to `true` and
+ the `host` to the FQDN under which GitLab Pages will be served:
```bash
## GitLab Pages
@@ -82,7 +83,13 @@ See the relevant documentation at <http://doc.gitlab.com/omnibus/settings/pages.
server_name ~^(?<group>.*)\.gitlabpages\.com$;
```
- You must be extra careful to not remove the backslashes.
+ You must be extra careful to not remove the backslashes. If you are using
+ a subdomain, make sure to escape all dots (`.`) with a backslash (\).
+ For example `pages.gitlab.io` would be:
+
+ ```
+ server_name ~^(?<group>.*)\.pages\.gitlab\.io$;
+ ```
1. Restart Nginx and GitLab:
@@ -108,7 +115,7 @@ required.
# The domain under which the pages are served:
# http://group.example.com/project
# or project path can be a group page: group.example.com
- host: gitlabpages.com
+ host: example.com
port: 443 # Set to 443 if you serve the pages with HTTPS
https: true # Set to true if you serve the pages with HTTPS
```
@@ -120,7 +127,8 @@ required.
```
Make sure to edit the config to add your domain as well as correctly point
- to the right location where the SSL certificates reside.
+ to the right location where the SSL certificates reside. After all changes
+ restart Nginx.
## Set maximum pages size