4912f10df8
Required for gitlab-ce 15.1 Changelog: https://gitlab.com/gitlab-org/gitaly/-/blob/master/CHANGELOG.md#1510-2022-06-21 15.1.0 (2022-06-21) Added (4 changes) operations: Return structured errors on conflict in UserMergeBranch (merge request) praefect: Add list-storages subcommand (merge request) gitaly/config: Add option to ignore gitconfig files (merge request) Make Git build with SHA256 routines in FIPS mode (merge request) Fixed (10 changes) operations: Use structured errors in UserDeleteBranch (merge request) datastore: Fix migration that prunes maintenance-style replication jobs (merge request) catfile: Fix deadlock between reading a new object and accessing it (merge request) catfile: Fix dirtiness check when current object has been fully read (merge request) streamcache: Unlock waiters after cache keys have been pruned (merge request) gitpipe: Fix closing queue too early (merge request) gitpipe: Fix deadlock on context cancellation with unflushed requests (merge request) Makefile: Fix install target using doubly-prefixed Gitaly paths (merge request) cgroups: Handle nil repo (merge request) supervisor: Fix leaking logrus Goroutine on spawn failure (merge request) Changed (5 changes) Update nokogiri to v1.13.6 (merge request) metadatahandler: Add grpc_method to prometheus metric (merge request) Enable feature flag exact_pagination_token_match by default (merge request) gitaly-lfs-smudge: Update git-lfs module and dependencies (merge request) linguist: Implement wrapper to ignore gitconfig in Rugged (merge request) Security (1 change) Makefile: Run bundle in frozen mode (merge request) Performance (1 change) repository: Use long-running filter process for converting LFS pointers (merge request)
84 lines
3.2 KiB
Plaintext
84 lines
3.2 KiB
Plaintext
--- config.toml.example.orig 2022-06-21 10:12:22 UTC
|
|
+++ config.toml.example
|
|
@@ -2,10 +2,10 @@
|
|
# Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
|
|
# https://docs.gitlab.com/ee//administration/gitaly/reference
|
|
|
|
-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
|
|
+socket_path = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket"
|
|
|
|
# The directory where Gitaly's executables are stored
|
|
-bin_dir = "/home/git/gitaly/_build/bin"
|
|
+bin_dir = "%%PREFIX%%/share/gitaly/bin/"
|
|
|
|
# # Optional: The directory where Gitaly can create all files required to
|
|
# # properly operate at runtime. If not set, Gitaly will create a directory in
|
|
@@ -22,7 +22,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
|
|
# # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly
|
|
# # named temp directory each time it boots.
|
|
# # Non Gitaly clients should never connect to these sockets.
|
|
-# internal_socket_dir = "/home/git/gitlab/tmp/sockets/private/internal"
|
|
+internal_socket_dir = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/internal"
|
|
|
|
# # Optional: authenticate Gitaly requests using a shared secret
|
|
# [auth]
|
|
@@ -33,9 +33,9 @@ bin_dir = "/home/git/gitaly/_build/bin"
|
|
# certificate_path = '/home/git/cert.cert'
|
|
# key_path = '/home/git/key.pem'
|
|
|
|
-# # Git settings
|
|
-# [git]
|
|
-# bin_path = "/usr/bin/git"
|
|
+# Git settings
|
|
+[git]
|
|
+bin_path = "%%PREFIX%%/bin/git"
|
|
# catfile_cache_size = 100
|
|
#
|
|
# # Set this setting to `true` to start ignoring gitconfig files installed in
|
|
@@ -51,7 +51,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
|
|
|
|
[[storage]]
|
|
name = "default"
|
|
-path = "/home/git/repositories"
|
|
+path = "%%PREFIX%%/git/repositories"
|
|
|
|
# # You can optionally configure more storages for this Gitaly instance to serve up
|
|
#
|
|
@@ -63,7 +63,7 @@ path = "/home/git/repositories"
|
|
# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
|
|
# [logging]
|
|
# # The directory where Gitaly stores extra log files
|
|
-dir = "/home/git/gitlab/log"
|
|
+dir = "%%PREFIX%%/www/gitlab-ce/log"
|
|
# format = "json"
|
|
# # Optional: Set log level to only log entries with that severity or above
|
|
# # One of, in order: debug, info, warn, errror, fatal, panic
|
|
@@ -81,7 +81,7 @@ dir = "/home/git/gitlab/log"
|
|
|
|
[gitaly-ruby]
|
|
# The directory where gitaly-ruby is installed
|
|
-dir = "/home/git/gitaly/ruby"
|
|
+dir = "%%PREFIX%%/share/gitaly/ruby"
|
|
|
|
# # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
|
|
# max_rss = 200000000
|
|
@@ -101,14 +101,14 @@ dir = "/home/git/gitaly/ruby"
|
|
|
|
[gitlab-shell]
|
|
# The directory where gitlab-shell is installed
|
|
-dir = "/home/git/gitlab-shell"
|
|
+dir = "%%PREFIX%%/share/gitlab-shell"
|
|
|
|
[hooks]
|
|
-custom_hooks_dir = "/home/git/custom_hooks"
|
|
+custom_hooks_dir = "%%PREFIX%%/git/custom_hooks"
|
|
|
|
[gitlab]
|
|
-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
|
|
-url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
|
|
+secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret"
|
|
+url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
|
|
# Only needed if a UNIX socket is used in `url` and GitLab is configured to
|
|
# use a relative path (e.g. /gitlab).
|
|
# relative_url_root = '/'
|