summaryrefslogtreecommitdiff
path: root/doc/pages/administration.md
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-12-17 19:25:28 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:53:55 +0000
commit94fdf58a87f8f2cc54c0482a2fce9e3fa425d4b9 (patch)
tree63343874a29cc4213b935f8d5a5fcbee6579149b /doc/pages/administration.md
parent38028d92539afb70ab6c1d5ec0d03299a9d2c1db (diff)
downloadgitlab-ce-94fdf58a87f8f2cc54c0482a2fce9e3fa425d4b9.tar.gz
Store pages in shared/pages/fqdn/fqdn/public or shared/pages/fqdn/subpath/public - makes it simpler to implement CNAMEs in future
Diffstat (limited to 'doc/pages/administration.md')
-rw-r--r--doc/pages/administration.md12
1 files changed, 3 insertions, 9 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md
index 6e242efae9f..28e975e5621 100644
--- a/doc/pages/administration.md
+++ b/doc/pages/administration.md
@@ -74,22 +74,16 @@ See the relevant documentation at <http://doc.gitlab.com/omnibus/settings/pages.
your GitLab pages domain is `gitlabpages.com`, replace
```bash
- server_name ~^(?<group>.*)\.YOUR_GITLAB_PAGES\.DOMAIN$;
+ server_name *.YOUR_GITLAB_PAGES.DOMAIN;
```
with
```
- server_name ~^(?<group>.*)\.gitlabpages\.com$;
+ server_name *.gitlabpages.com;
```
- 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$;
- ```
+ You must be add `*` in front of your domain, this is required to catch all subdomains of gitlabpages.com.
1. Restart Nginx and GitLab: