diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 15:06:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 15:06:18 +0300 |
| commit | 6a4ffad42050949fcf08e78147575734ae99627e (patch) | |
| tree | 723bb2480948ba4ec29ca9ac10f8728dc2a831b6 /doc/administration | |
| parent | 23d237110e6a646dec08e1f5b4696d2d9c51cfef (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/monitoring/performance/img/performance_bar.png | bin | 71317 -> 58439 bytes | |||
| -rw-r--r-- | doc/administration/monitoring/performance/performance_bar.md | 1 | ||||
| -rw-r--r-- | doc/administration/pages/index.md | 17 |
3 files changed, 18 insertions, 0 deletions
diff --git a/doc/administration/monitoring/performance/img/performance_bar.png b/doc/administration/monitoring/performance/img/performance_bar.png Binary files differindex acad60f863e..73f2ccbe4bb 100644 --- a/doc/administration/monitoring/performance/img/performance_bar.png +++ b/doc/administration/monitoring/performance/img/performance_bar.png diff --git a/doc/administration/monitoring/performance/performance_bar.md b/doc/administration/monitoring/performance/performance_bar.md index a52b6227e14..caddc87d8c1 100644 --- a/doc/administration/monitoring/performance/performance_bar.md +++ b/doc/administration/monitoring/performance/performance_bar.md @@ -19,6 +19,7 @@ It allows you to see (from left to right): - a link to add a request's details to the performance bar; the request can be added by its full URL (authenticated as the current user), or by the value of its `X-Request-Id` header +- a link to download the raw JSON used to generate the Performance Bar reports On the far right is a request selector that allows you to view the same metrics (excluding the page timing and line profiler) for any requests made while the diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index f51c375860b..eb3fc07d7c9 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -321,6 +321,23 @@ pages: 1. [Reconfigure GitLab][reconfigure] for the changes to take effect. +### Using a custom Certificate Authority (CA) with Access Control + +When using certificates issued by a custom CA, Access Control on GitLab Pages may fail 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 GitLab Pages Access Control with TLS/SSL certs issued by an internal or custom CA: + +1. Copy the certificate bundle to `/opt/gitlab/embedded/ssl/certs/` in `.pem` format. + +1. [Restart](../restart_gitlab.md) the GitLab Pages Daemon. For GitLab Omnibus instances: + + ```bash + sudo gitlab-ctl restart gitlab-pages + ``` + ## Activate verbose logging for daemon Verbose logging was [introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/2533) in |
