mirror of
https://git.freebsd.org/ports.git
synced 2025-07-11 22:39:16 -04:00
1e0e936bbf
Required for gitlab-ce 16.3. Use an internal libgit2 as the FreeBSD installed version is to new but git2go does not support a newer version yet: https://github.com/libgit2/git2go/issues/951 Changelog: https://gitlab.com/gitlab-org/gitaly/-/blob/master/CHANGELOG.md
77 lines
2.9 KiB
Text
77 lines
2.9 KiB
Text
--- config.toml.example.orig 2023-08-21 09:20:49 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
|
|
#
|
|
# [[git.config]]
|
|
@@ -44,7 +44,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
|
|
#
|
|
@@ -54,9 +54,9 @@ path = "/home/git/repositories"
|
|
#
|
|
|
|
# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
|
|
-# [logging]
|
|
+[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
|
|
@@ -72,14 +72,14 @@ dir = "/home/git/gitlab/log"
|
|
|
|
[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 = '/'
|