Commit 75c22f42 authored by Amy Qualls's avatar Amy Qualls

Merge branch 'docs-pages-realistic-url-scheme' into 'master'

Docs: Improve Pages URL scheme examples

See merge request gitlab-org/gitlab!37951
parents 2fad1023 e36c8eca
...@@ -114,7 +114,7 @@ since that is needed in all configurations. ...@@ -114,7 +114,7 @@ since that is needed in all configurations.
--- ---
URL scheme: `http://page.example.io` URL scheme: `http://<namespace>.example.io/<project_slug>`
This is the minimum setup that you can use Pages with. It is the base for all This is the minimum setup that you can use Pages with. It is the base for all
other setups as described below. NGINX will proxy all requests to the daemon. other setups as described below. NGINX will proxy all requests to the daemon.
...@@ -139,7 +139,7 @@ Watch the [video tutorial](https://youtu.be/dD8c7WNcc6s) for this configuration. ...@@ -139,7 +139,7 @@ Watch the [video tutorial](https://youtu.be/dD8c7WNcc6s) for this configuration.
--- ---
URL scheme: `https://page.example.io` URL scheme: `https://<namespace>.example.io/<project_slug>`
NGINX will proxy all requests to the daemon. Pages daemon doesn't listen to the NGINX will proxy all requests to the daemon. Pages daemon doesn't listen to the
outside world. outside world.
...@@ -254,7 +254,7 @@ you have IPv6 as well as IPv4 addresses, you can use them both. ...@@ -254,7 +254,7 @@ you have IPv6 as well as IPv4 addresses, you can use them both.
--- ---
URL scheme: `http://page.example.io` and `http://domain.com` URL scheme: `http://<namespace>.example.io/<project_slug>` and `http://custom-domain.com`
In that case, the Pages daemon is running, NGINX still proxies requests to In that case, the Pages daemon is running, NGINX still proxies requests to
the daemon but the daemon is also able to receive requests from the outside the daemon but the daemon is also able to receive requests from the outside
...@@ -285,7 +285,7 @@ world. Custom domains are supported, but no TLS. ...@@ -285,7 +285,7 @@ world. Custom domains are supported, but no TLS.
--- ---
URL scheme: `https://page.example.io` and `https://domain.com` URL scheme: `https://<namespace>.example.io/<project_slug>` and `https://custom-domain.com`
In that case, the Pages daemon is running, NGINX still proxies requests to In that case, the Pages daemon is running, NGINX still proxies requests to
the daemon but the daemon is also able to receive requests from the outside the daemon but the daemon is also able to receive requests from the outside
......
...@@ -94,7 +94,7 @@ since that is needed in all configurations. ...@@ -94,7 +94,7 @@ since that is needed in all configurations.
- [Wildcard DNS setup](#dns-configuration) - [Wildcard DNS setup](#dns-configuration)
URL scheme: `http://page.example.io` URL scheme: `http://<namespace>.example.io/<project_slug>`
This is the minimum setup that you can use Pages with. It is the base for all This is the minimum setup that you can use Pages with. It is the base for all
other setups as described below. NGINX will proxy all requests to the daemon. other setups as described below. NGINX will proxy all requests to the daemon.
...@@ -157,7 +157,7 @@ The Pages daemon doesn't listen to the outside world. ...@@ -157,7 +157,7 @@ The Pages daemon doesn't listen to the outside world.
- [Wildcard DNS setup](#dns-configuration) - [Wildcard DNS setup](#dns-configuration)
- Wildcard TLS certificate - Wildcard TLS certificate
URL scheme: `https://page.example.io` URL scheme: `https://<namespace>.example.io/<project_slug>`
NGINX will proxy all requests to the daemon. Pages daemon doesn't listen to the NGINX will proxy all requests to the daemon. Pages daemon doesn't listen to the
outside world. outside world.
...@@ -221,7 +221,7 @@ that without TLS certificates. ...@@ -221,7 +221,7 @@ that without TLS certificates.
- [Wildcard DNS setup](#dns-configuration) - [Wildcard DNS setup](#dns-configuration)
- Secondary IP - Secondary IP
URL scheme: `http://page.example.io` and `http://domain.com` URL scheme: `http://<namespace>.example.io/<project_slug>` and `http://custom-domain.com`
In that case, the pages daemon is running, NGINX still proxies requests to In that case, the pages daemon is running, NGINX still proxies requests to
the daemon but the daemon is also able to receive requests from the outside the daemon but the daemon is also able to receive requests from the outside
...@@ -286,7 +286,7 @@ world. Custom domains are supported, but no TLS. ...@@ -286,7 +286,7 @@ world. Custom domains are supported, but no TLS.
- Wildcard TLS certificate - Wildcard TLS certificate
- Secondary IP - Secondary IP
URL scheme: `https://page.example.io` and `https://domain.com` URL scheme: `https://<namespace>.example.io/<project_slug>` and `https://custom-domain.com`
In that case, the pages daemon is running, NGINX still proxies requests to In that case, the pages daemon is running, NGINX still proxies requests to
the daemon but the daemon is also able to receive requests from the outside the daemon but the daemon is also able to receive requests from the outside
......
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