diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-04 18:07:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-04 18:07:23 +0300 |
commit | 4938925517ffb73a07fbf55972ea415bd90ea342 (patch) | |
tree | c0258ddd137ce50265050b19c46659d59e6b76c8 /doc/administration | |
parent | f2fd07aa1c0bfb732b80c3d028cd23c91547991c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/packages/container_registry.md | 3 | ||||
-rw-r--r-- | doc/administration/pages/index.md | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md index c732bccef9a..2623f2afd8d 100644 --- a/doc/administration/packages/container_registry.md +++ b/doc/administration/packages/container_registry.md @@ -198,7 +198,8 @@ docker login gitlab.example.com:5050 When the Registry is configured to use its own domain, you need a TLS certificate for that specific domain (for example, `registry.example.com`). You might need a wildcard certificate if hosted under a subdomain of your existing GitLab -domain, for example, `registry.gitlab.example.com`. +domain. For example, `*.gitlab.example.com`, is a wildcard that matches `registry.gitlab.example.com`, +and is distinct from `*.example.com`. As well as manually generated SSL certificates (explained here), certificates automatically generated by Let's Encrypt are also [supported in Omnibus installs](https://docs.gitlab.com/omnibus/settings/ssl.html). diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index fa057c81580..d154adf1d78 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -260,6 +260,7 @@ control over how the Pages daemon runs and serves content in your environment. | `gitlab_id` | The OAuth application public ID. Leave blank to automatically fill when Pages authenticates with GitLab. | | `gitlab_secret` | The OAuth application secret. Leave blank to automatically fill when Pages authenticates with GitLab. | | `auth_scope` | The OAuth application scope to use for authentication. Must match GitLab Pages OAuth application settings. Leave blank to use `api` scope by default. | +| `auth_cookie_session_timeout` | Authentication cookie session timeout in seconds (default: 600s). A value of `0` means the cookie is deleted after the browser session ends. | | `gitlab_server` | Server to use for authentication when access control is enabled; defaults to GitLab `external_url`. | | `headers` | Specify any additional http headers that should be sent to the client with each response. Multiple headers can be given as an array, header and value as one string, for example `['my-header: myvalue', 'my-other-header: my-other-value']` | | `enable_disk` | Allows the GitLab Pages daemon to serve content from disk. Shall be disabled if shared disk storage isn't available. | |