diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-12-18 12:18:11 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:53:55 +0000 |
| commit | 4afab3d4b64bf4aac228306636bb1b477debe8ce (patch) | |
| tree | 9f26dd9ad06ab3976b328b330b4cc0e13185fc0d /doc/pages/administration.md | |
| parent | 6bb7a19c2b4b130438cc4f24512feac9941a9b02 (diff) | |
| download | gitlab-ce-4afab3d4b64bf4aac228306636bb1b477debe8ce.tar.gz | |
Revert "Store pages in shared/pages/fqdn/fqdn/public or shared/pages/fqdn/subpath/public - makes it simpler to implement CNAMEs in future"
This reverts commit 86a2a78f0d13a678899460638add6b862059433e.
Diffstat (limited to 'doc/pages/administration.md')
| -rw-r--r-- | doc/pages/administration.md | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md index 29762829819..98a26ec7be9 100644 --- a/doc/pages/administration.md +++ b/doc/pages/administration.md @@ -74,16 +74,22 @@ See the relevant documentation at <http://doc.gitlab.com/omnibus/settings/pages. your GitLab pages domain is `gitlabpages.com`, replace ```bash - server_name *.YOUR_GITLAB_PAGES.DOMAIN; + server_name ~^(?<group>.*)\.YOUR_GITLAB_PAGES\.DOMAIN$; ``` with ``` - server_name *.gitlabpages.com; + server_name ~^(?<group>.*)\.gitlabpages\.com$; ``` - You must be add `*` in front of your domain, this is required to catch all subdomains of 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$; + ``` 1. Restart Nginx and GitLab: |