b838d9b5da
Changelog: https://about.gitlab.com/releases/2021/04/22/gitlab-13-11-released/ https://about.gitlab.com/releases/2021/04/23/gitlab-13-11-1-released/
71 lines
3.1 KiB
Plaintext
71 lines
3.1 KiB
Plaintext
--- config/gitlab.yml.example.orig 2021-04-22 21:13:23 UTC
|
|
+++ config/gitlab.yml.example
|
|
@@ -1084,7 +1084,7 @@ production: &base
|
|
# Gitaly settings
|
|
gitaly:
|
|
# Path to the directory containing Gitaly client executables.
|
|
- client_path: /home/git/gitaly
|
|
+ client_path: %%PREFIX%%/share/gitaly/bin
|
|
# Default Gitaly authentication token. Can be overridden per storage. Can
|
|
# be left blank when Gitaly is running locally on a Unix socket, which
|
|
# is the normal way to deploy Gitaly.
|
|
@@ -1102,8 +1102,8 @@ production: &base
|
|
# real path not the symlink.
|
|
storages: # You must have at least a `default` storage path.
|
|
default:
|
|
- path: /home/git/repositories/
|
|
- gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
|
|
+ path: %%PREFIX%%/git/repositories/
|
|
+ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
|
|
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
|
|
|
|
## Backup settings
|
|
@@ -1149,12 +1149,12 @@ production: &base
|
|
|
|
## GitLab Shell settings
|
|
gitlab_shell:
|
|
- path: /home/git/gitlab-shell/
|
|
- authorized_keys_file: /home/git/.ssh/authorized_keys
|
|
+ path: %%PREFIX%%/share/gitlab-shell/
|
|
+ authorized_keys_file: %%PREFIX%%/git/.ssh/authorized_keys
|
|
|
|
# File that contains the secret key for verifying access for gitlab-shell.
|
|
# Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
|
|
- # secret_file: /home/git/gitlab/.gitlab_shell_secret
|
|
+ # secret_file: %%PREFIX%%/www/gitlab-ce/.gitlab_shell_secret
|
|
|
|
# Git over HTTP
|
|
upload_pack: true
|
|
@@ -1169,13 +1169,13 @@ production: &base
|
|
workhorse:
|
|
# File that contains the secret key for verifying access for gitlab-workhorse.
|
|
# Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).
|
|
- # secret_file: /home/git/gitlab/.gitlab_workhorse_secret
|
|
+ # secret_file: %%PREFIX%%/www/gitlab-ce/.gitlab_workhorse_secret
|
|
|
|
gitlab_kas:
|
|
# enabled: true
|
|
# File that contains the secret key for verifying access for gitlab-kas.
|
|
# Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app).
|
|
- # secret_file: /home/git/gitlab/.gitlab_kas_secret
|
|
+ # secret_file: %%PREFIX%%/www/gitlab-ce/.gitlab_kas_secret
|
|
|
|
# The URL to the external KAS API (used by the Kubernetes agents)
|
|
# external_url: wss://kas.example.com
|
|
@@ -1185,13 +1185,13 @@ production: &base
|
|
|
|
## GitLab Elasticsearch settings
|
|
elasticsearch:
|
|
- indexer_path: /home/git/gitlab-elasticsearch-indexer/
|
|
+ indexer_path: %%PREFIX%%/bin/
|
|
|
|
## Git settings
|
|
# CAUTION!
|
|
# Use the default values unless you really know what you are doing
|
|
git:
|
|
- bin_path: /usr/bin/git
|
|
+ bin_path: %%PREFIX%%/bin/git
|
|
|
|
## Webpack settings
|
|
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
|