diff options
Diffstat (limited to 'doc/administration/pages')
-rw-r--r-- | doc/administration/pages/index.md | 10 | ||||
-rw-r--r-- | doc/administration/pages/source.md | 22 | ||||
-rw-r--r-- | doc/administration/pages/troubleshooting.md | 9 |
3 files changed, 23 insertions, 18 deletions
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index 726307229d6..c84e5eb8c8c 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -350,7 +350,7 @@ world. Custom domains are supported, but no TLS. **Requirements:** - [Wildcard DNS setup](#dns-configuration) -- Wildcard TLS certificate +- TLS certificate. Can be either Wildcard, or any other type meeting the [requirements](../../user/project/pages/custom_domains_ssl_tls_certification/index.md#manual-addition-of-ssltls-certificates). - Secondary IP --- @@ -527,11 +527,11 @@ fails to work if the custom CA is not recognized. This usually results in this error: `Post /oauth/token: x509: certificate signed by unknown authority`. -For installation from source, this can be fixed by installing the custom Certificate -Authority (CA) in the system certificate store. - For Linux package installations, this is fixed by [installing a custom CA](https://docs.gitlab.com/omnibus/settings/ssl/index.html#install-custom-public-certificates). +For self-compiled installations, this can be fixed by installing the custom Certificate +Authority (CA) in the system certificate store. + ### ZIP serving and cache configuration > [Introduced](https://gitlab.com/gitlab-org/gitlab-pages/-/merge_requests/392) in GitLab 13.7. @@ -968,7 +968,7 @@ See [the available connection settings for different providers](../object_storag region: eu-central-1 ``` -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source) +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations) for the changes to take effect. 1. [Migrate existing Pages deployments to object storage.](#migrate-pages-deployments-to-object-storage) diff --git a/doc/administration/pages/source.md b/doc/administration/pages/source.md index 26dedd47473..97dacfc1902 100644 --- a/doc/administration/pages/source.md +++ b/doc/administration/pages/source.md @@ -183,8 +183,8 @@ The Pages daemon doesn't listen to the outside world. sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages.conf ``` -1. Restart NGINX -1. [Restart GitLab](../restart_gitlab.md#installations-from-source) +1. Restart NGINX. +1. [Restart GitLab](../restart_gitlab.md#self-compiled-installations). ### Wildcard domains with TLS support @@ -240,8 +240,8 @@ outside world. sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf ``` -1. Restart NGINX -1. [Restart GitLab](../restart_gitlab.md#installations-from-source) +1. Restart NGINX. +1. [Restart GitLab](../restart_gitlab.md#self-compiled-installations). ## Advanced configuration @@ -310,8 +310,8 @@ world. Custom domains are supported, but no TLS. 1. Edit all GitLab related configurations in `/etc/nginx/site-available/` and replace `0.0.0.0` with `192.0.2.1`, where `192.0.2.1` the primary IP where GitLab listens to. -1. Restart NGINX -1. [Restart GitLab](../restart_gitlab.md#installations-from-source) +1. Restart NGINX. +1. [Restart GitLab](../restart_gitlab.md#self-compiled-installations). ### Custom domains with TLS support @@ -378,13 +378,13 @@ world. Custom domains and TLS are supported. 1. Edit all GitLab related configurations in `/etc/nginx/site-available/` and replace `0.0.0.0` with `192.0.2.1`, where `192.0.2.1` the primary IP where GitLab listens to. -1. Restart NGINX -1. [Restart GitLab](../restart_gitlab.md#installations-from-source) +1. Restart NGINX. +1. [Restart GitLab](../restart_gitlab.md#self-compiled-installations). ## NGINX caveats NOTE: -The following information applies only for installations from source. +The following information applies only to self-compiled installations. Be extra careful when setting up the domain name in the NGINX configuration. You must not remove the backslashes. @@ -438,7 +438,7 @@ Pages access control is disabled by default. To enable it: access_control: true ``` -1. [Restart GitLab](../restart_gitlab.md#installations-from-source). +1. [Restart GitLab](../restart_gitlab.md#self-compiled-installations). 1. Create a new [system OAuth application](../../integration/oauth_provider.md#create-a-user-owned-application). This should be called `GitLab Pages` and have a `Redirect URL` of `https://projects.example.io/auth`. It does not need to be a "trusted" @@ -471,7 +471,7 @@ are stored. path: /mnt/storage/pages ``` -1. [Restart GitLab](../restart_gitlab.md#installations-from-source) +1. [Restart GitLab](../restart_gitlab.md#self-compiled-installations). ## Set maximum Pages size diff --git a/doc/administration/pages/troubleshooting.md b/doc/administration/pages/troubleshooting.md index 7e184631515..a103c793763 100644 --- a/doc/administration/pages/troubleshooting.md +++ b/doc/administration/pages/troubleshooting.md @@ -212,8 +212,13 @@ Once added, reconfigure with `sudo gitlab-ctl reconfigure` and restart GitLab wi You may see this error if `pages_external_url` was updated at some point of time. Verify the following: -1. The **Callback URL**/Redirect URI in the GitLab Pages [System OAuth application](../../integration/oauth_provider.md#create-an-instance-wide-application) -is using the protocol (HTTP or HTTPS) that `pages_external_url` is configured to use. +1. Check the [System OAuth application](../../integration/oauth_provider.md#create-an-instance-wide-application): + + 1. On the left sidebar, expand the top-most chevron (**{chevron-down}**). + 1. Select **Admin Area**. + 1. Select **Applications** and then **Add new application**. + 1. Ensure the **Callback URL/Redirect URI** is using the protocol (HTTP or HTTPS) that + `pages_external_url` is configured to use. 1. The domain and path components of `Redirect URI` are valid: they should look like `projects.<pages_external_url>/auth`. ## 500 error `cannot serve from disk` |