diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-02-07 12:06:43 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-02-07 12:06:43 +0000 |
| commit | 4b74da30a513ada6532d1ef7ec7bde79d0c9a0f6 (patch) | |
| tree | 6e8909efc7a71f8978beb0c413221b3529726d03 | |
| parent | 42956f21bad619e5b906565867a749469accb853 (diff) | |
| parent | cf32e2620006d6eb0b2d62a4d26a4e3ca651e478 (diff) | |
| download | gitlab-ce-4b74da30a513ada6532d1ef7ec7bde79d0c9a0f6.tar.gz | |
Merge branch 'docs-pages-dns-update' into 'master'
Docs: clarify DNS records for Pages
Closes #42957
See merge request gitlab-org/gitlab-ce!24767
| -rw-r--r-- | doc/user/project/pages/getting_started_part_three.md | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/doc/user/project/pages/getting_started_part_three.md b/doc/user/project/pages/getting_started_part_three.md index 68dd3330d7a..b2da1c85c62 100644 --- a/doc/user/project/pages/getting_started_part_three.md +++ b/doc/user/project/pages/getting_started_part_three.md @@ -79,11 +79,14 @@ running on your instance).  -NOTE: **Note:** -Note that if you use your root domain for your GitLab Pages website **only**, and if -your domain registrar supports this feature, you can add a DNS apex `CNAME` -record instead of an `A` record. The main advantage of doing so is that when GitLab Pages -IP on GitLab.com changes for whatever reason, you don't need to update your `A` record. +CAUTION: **Caution:** +Note that if you use your root domain for your GitLab Pages website +**only**, and if your domain registrar supports this feature, you can +add a DNS apex `CNAME` record instead of an `A` record. The main +advantage of doing so is that when GitLab Pages IP on GitLab.com +changes for whatever reason, you don't need to update your `A` record. +There may be a few exceptions, but **this method is not recommended** +as it most likely won't work if you set an `MX` record for your root domain. #### DNS CNAME record @@ -114,14 +117,16 @@ co-exist, so you need to place the TXT record in a special subdomain of its own. #### TL;DR -If the domain has multiple uses (e.g., you host email on it as well): +For root domains (`domain.com`), set a DNS `A` record and verify your +domain's ownership with a TXT record: | From | DNS Record | To | | ---- | ---------- | -- | | domain.com | A | 35.185.44.232 | | domain.com | TXT | gitlab-pages-verification-code=00112233445566778899aabbccddeeff | -If the domain is dedicated to GitLab Pages use and no other services run on it: +For subdomains (`subdomain.domain.com`), set a DNS `CNAME` record and +verify your domain's ownership with a TXT record: | From | DNS Record | To | | ---- | ---------- | -- | |