Commit 8fb40829 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'cherry-pick-bba00a8a' into '8-17-stable'

Backport GitLab.com Pages IP change to 8.17

[ci skip]

See merge request !9934
parents a8812aaa 205d268a
...@@ -53,14 +53,14 @@ In case you want to point a root domain (`example.com`) to your ...@@ -53,14 +53,14 @@ In case you want to point a root domain (`example.com`) to your
GitLab Pages site, deployed to `namespace.gitlab.io`, you need to GitLab Pages site, deployed to `namespace.gitlab.io`, you need to
log into your domain's admin control panel and add a DNS `A` record log into your domain's admin control panel and add a DNS `A` record
pointing your domain to Pages' server IP address. For projects on pointing your domain to Pages' server IP address. For projects on
GitLab.com, this IP is `104.208.235.32`. For projects leaving in GitLab.com, this IP is `52.167.214.135`. For projects leaving in
other GitLab instances (CE or EE), please contact your sysadmin other GitLab instances (CE or EE), please contact your sysadmin
asking for this information (which IP address is Pages server asking for this information (which IP address is Pages server
running on your instance). running on your instance).
**Practical Example:** **Practical Example:**
![DNS A record pointing to GitLab.com Pages server](img/dns_a_record_example.png) ![DNS A record pointing to GitLab.com Pages server](img/dns_add_new_a_record_example_updated.png)
#### DNS CNAME record #### DNS CNAME record
...@@ -82,7 +82,7 @@ without any `/project-name`. ...@@ -82,7 +82,7 @@ without any `/project-name`.
| From | DNS Record | To | | From | DNS Record | To |
| ---- | ---------- | -- | | ---- | ---------- | -- |
| domain.com | A | 104.208.235.32 | | domain.com | A | 52.167.214.135 |
| subdomain.domain.com | CNAME | namespace.gitlab.io | | subdomain.domain.com | CNAME | namespace.gitlab.io |
> **Notes**: > **Notes**:
...@@ -92,6 +92,7 @@ without any `/project-name`. ...@@ -92,6 +92,7 @@ without any `/project-name`.
> - **Do not** add any special chars after the default Pages > - **Do not** add any special chars after the default Pages
domain. E.g., **do not** point your `subdomain.domain.com` to domain. E.g., **do not** point your `subdomain.domain.com` to
`namespace.gitlab.io.` or `namespace.gitlab.io/`. `namespace.gitlab.io.` or `namespace.gitlab.io/`.
> - GitLab Pages IP on GitLab.com [has been changed](https://about.gitlab.com/2017/03/06/we-are-changing-the-ip-of-gitlab-pages-on-gitlab-com/) from `104.208.235.32` to `52.167.214.135`.
### SSL/TLS Certificates ### SSL/TLS Certificates
......
...@@ -10,10 +10,11 @@ Here's some info we've gathered to get you started. ...@@ -10,10 +10,11 @@ Here's some info we've gathered to get you started.
## General info ## General info
- [Product webpage](https://pages.gitlab.io) - [Product webpage](https://pages.gitlab.io)
- ["We're bringing GitLab Pages to CE" blog post](https://about.gitlab.com/2016/12/24/were-bringing-gitlab-pages-to-community-edition/) - ["We're bringing GitLab Pages to CE"](https://about.gitlab.com/2016/12/24/were-bringing-gitlab-pages-to-community-edition/)
- [Pages group - templates](https://gitlab.com/pages) - [Pages group - templates](https://gitlab.com/pages)
- [General user documentation](introduction.md) - [General user documentation](introduction.md)
- [Admin documentation - Set GitLab Pages on your own GitLab instance](../../../administration/pages/index.md) - [Admin documentation - Set GitLab Pages on your own GitLab instance](../../../administration/pages/index.md)
- ["We are changing the IP of GitLab Pages on GitLab.com"](https://about.gitlab.com/2017/03/06/we-are-changing-the-ip-of-gitlab-pages-on-gitlab-com/)
## Getting started ## Getting started
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment