Skip to content
Snippets Groups Projects
Verified Commit 991e60d6 authored by Olivier Benz's avatar Olivier Benz
Browse files

Update sample docker-compose.yml

parent 51e55c60
No related branches found
No related tags found
No related merge requests found
......@@ -101,7 +101,7 @@ This project depends on the following
1. Optional: Set these environment variables in 'docker-compose.yml':
* Uncomment line 69 if you have set
`GL_INITIAL_SHARED_RUNNERS_REGISTRATION_TOKEN` in step 4.
* Uncomment line 119 if you have set `MM_FILESETTINGS_PUBLICLINKSALT` in
* Uncomment line 120 if you have set `MM_FILESETTINGS_PUBLICLINKSALT` in
step 4.
1. Start the container in detached mode:
```bash
......
......@@ -246,6 +246,18 @@ external_url 'GENERATED_EXTERNAL_URL'
###! but continue accepting application requests.
# gitlab_rails['shutdown_blackout_seconds'] = 10
### Microsoft Graph Mailer
###! Allows delivery of emails using Microsoft Graph API with OAuth 2.0 client
###! credentials flow.
###! Docs: https://docs.gitlab.com/omnibus/settings/microsoft_graph_mailer.html
# gitlab_rails['microsoft_graph_mailer_enabled'] = false
# gitlab_rails['microsoft_graph_mailer_user_id'] = "YOUR-USER-ID"
# gitlab_rails['microsoft_graph_mailer_tenant'] = "YOUR-TENANT-ID"
# gitlab_rails['microsoft_graph_mailer_client_id'] = "YOUR-CLIENT-ID"
# gitlab_rails['microsoft_graph_mailer_client_secret'] = "YOUR-CLIENT-SECRET-ID"
# gitlab_rails['microsoft_graph_mailer_azure_ad_endpoint'] = "https://login.microsoftonline.com"
# gitlab_rails['microsoft_graph_mailer_graph_endpoint'] = "https://graph.microsoft.com"
### Reply by email
###! Allow users to comment on issues and merge requests by replying to
###! notification emails.
......@@ -1436,6 +1448,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# nginx['ssl_session_timeout'] = "1d"
# nginx['ssl_dhparam'] = nil # Path to dhparams.pem, eg. /etc/gitlab/ssl/dhparams.pem
# nginx['ssl_password_file'] = nil # Path to file with passphrases for ssl certificate secret keys
# nginx['listen_addresses'] = ['*', '[::]']
##! **Defaults to forcing web browsers to always communicate using only HTTPS**
......@@ -1702,6 +1715,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# gitlab_pages['internal_gitlab_server'] = nil # Defaults to gitlab_server, can be changed to internal load balancer
# gitlab_pages['auth_secret'] = nil # Generated if not present
# gitlab_pages['auth_scope'] = nil # Defaults to api, can be changed to read_api to increase security
# gitlab_pages['auth_cookie_session_timeout'] = "10m" # Authentication cookie session timeout (truncated to seconds). A zero value means the cookie will be deleted after the browser session ends
##! GitLab Pages Server Shutdown Timeout
##! Duration ("30s" for 30 seconds)
......@@ -2418,7 +2432,6 @@ external_url 'GENERATED_EXTERNAL_URL'
# praefect['key_path'] = "/var/opt/gitlab/prafect/key.pem"
# praefect['prometheus_listen_addr'] = "localhost:9652"
# praefect['prometheus_grpc_latency_buckets'] = "[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]"
# praefect['separate_database_metrics'] = true
# praefect['logging_level'] = "warn"
# praefect['logging_format'] = "json"
# praefect['virtual_storages'] = {
......@@ -3024,12 +3037,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# }
# }
# }
# consul['watchers'] = {
# 'postgresql' => {
# enable: false,
# handler: 'failover_pgbouncer'
# }
# }
# consul['watchers'] = []
#
# consul['custom_config_dir'] = '/path/to/service/configs/directory'
#
......
sources:
- file_name: gitlab.rb.template
url: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template
date: 2022-09-08
date: 2022-11-14
......@@ -87,6 +87,7 @@ services:
gitlab_rails['registry_enabled'] = true
## GitLab NGINX
#nginx['listen_addresses'] = ['0.0.0.0', '[::]']
nginx['listen_port'] = 80
nginx['listen_https'] = false
nginx['proxy_set_headers'] = {
......@@ -137,6 +138,7 @@ services:
## Mattermost NGINX
mattermost_nginx['enable'] = true
#mattermost_nginx['listen_addresses'] = ['*', '[::]']
mattermost_nginx['listen_port'] = 80
mattermost_nginx['listen_https'] = false
mattermost_nginx['proxy_set_headers'] = {
......@@ -149,6 +151,7 @@ services:
## Registry NGINX
registry_nginx['enable'] = true
#registry_nginx['listen_addresses'] = ['*', '[::]']
registry_nginx['listen_port'] = 80
registry_nginx['listen_https'] = false
registry_nginx['proxy_set_headers'] = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment