Skip to content

Commit 856093b

Browse files
balasankarcash2k
andcommitted
Merge branch 'ash2k/private-api-env-vars' into 'master'
KAS: mention new env vars for private API See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7159 Merged-by: Balasankar 'Balu' C <[email protected]> Approved-by: Jason Plum <[email protected]> Approved-by: Achilleas Pipinellis <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Reviewed-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: Mikhail Mazurskiy <[email protected]>
2 parents 6b81621 + 33c4dca commit 856093b

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

files/gitlab-config-template/gitlab.rb.template

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2037,8 +2037,15 @@ external_url 'GENERATED_EXTERNAL_URL'
20372037
##! Environment variables for GitLab KAS
20382038
# gitlab_kas['env'] = {
20392039
# 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/",
2040-
# # In a multi-node setup, this address MUST be reachable from other KAS instances. In a single-node setup, it can be on localhost for simplicity
2040+
# # In a multi-node setup, this address MUST be reachable from other KAS instances. In a single-node setup,
2041+
# # it can be on localhost for simplicity.
2042+
# # Use OWN_PRIVATE_API_CIDR + OWN_PRIVATE_API_PORT (optional) + OWN_PRIVATE_API_SCHEME (optional) if you cannot
2043+
# # specify a correct address for each KAS instance in OWN_PRIVATE_API_URL.
20412044
# 'OWN_PRIVATE_API_URL' => 'grpc://localhost:8155'
2045+
# # 'OWN_PRIVATE_API_CIDR' => '10.0.0.0/8', # IPv4 example
2046+
# # 'OWN_PRIVATE_API_CIDR' => '2001:db8:8a2e:370::7334/64', # IPv6 example
2047+
# # 'OWN_PRIVATE_API_PORT' => '8155', # if not set, port from private_api_listen_address is used
2048+
# # 'OWN_PRIVATE_API_SCHEME' => 'grpc', # use grpcs when using TLS on private API endpoint
20422049
# }
20432050

20442051
##! Error Reporting and Logging with Sentry

0 commit comments

Comments
 (0)