diff options
Diffstat (limited to 'doc/administration/pages/index.md')
| -rw-r--r-- | doc/administration/pages/index.md | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index a422efc0fcf..404e28c58c6 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -120,7 +120,7 @@ This example contains the following: - `example.com`: The GitLab domain. - `example.io`: The domain GitLab Pages is served from. - `192.0.2.1`: The primary IP of your GitLab instance. -- `192.0.2.2`: The secondary IP, which is dedicated to GitLab Pages. +- `192.0.2.2`: The secondary IP, which is dedicated to GitLab Pages. It must be different than the primary IP. NOTE: You should not use the GitLab domain to serve user pages. For more information see the [security section](#security). @@ -310,14 +310,12 @@ world. Custom domains are supported, but no TLS. ```ruby pages_external_url "http://example.io" - nginx['listen_addresses'] = ['192.0.2.1'] + nginx['listen_addresses'] = ['192.0.2.1'] # The primary IP of the GitLab instance pages_nginx['enable'] = false - gitlab_pages['external_http'] = ['192.0.2.2:80', '[2001:db8::2]:80'] + gitlab_pages['external_http'] = ['192.0.2.2:80', '[2001:db8::2]:80'] # The secondary IPs for the GitLab Pages daemon ``` - where `192.0.2.1` is the primary IP address that GitLab is listening to and - `192.0.2.2` and `2001:db8::2` are the secondary IPs the GitLab Pages daemon - listens on. If you don't have IPv6, you can omit the IPv6 address. + If you don't have IPv6, you can omit the IPv6 address. 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure). @@ -342,17 +340,15 @@ world. Custom domains and TLS are supported. ```ruby pages_external_url "https://example.io" - nginx['listen_addresses'] = ['192.0.2.1'] + nginx['listen_addresses'] = ['192.0.2.1'] # The primary IP of the GitLab instance pages_nginx['enable'] = false - gitlab_pages['external_http'] = ['192.0.2.2:80', '[2001:db8::2]:80'] - gitlab_pages['external_https'] = ['192.0.2.2:443', '[2001:db8::2]:443'] + gitlab_pages['external_http'] = ['192.0.2.2:80', '[2001:db8::2]:80'] # The secondary IPs for the GitLab Pages daemon + gitlab_pages['external_https'] = ['192.0.2.2:443', '[2001:db8::2]:443'] # The secondary IPs for the GitLab Pages daemon # Redirect pages from HTTP to HTTPS gitlab_pages['redirect_http'] = true ``` - where `192.0.2.1` is the primary IP address that GitLab is listening to and - `192.0.2.2` and `2001:db8::2` are the secondary IPs where the GitLab Pages daemon - listens on. If you don't have IPv6, you can omit the IPv6 address. + If you don't have IPv6, you can omit the IPv6 address. 1. If you haven't named your certificate and key `example.io.crt` and `example.io.key` respectively, then you need to also add the full paths as shown below: |