diff options
Diffstat (limited to 'devel/gitaly/files/patch-config.toml.example')
| -rw-r--r-- | devel/gitaly/files/patch-config.toml.example | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example index 33a08e4486c2..758d0dcb28ce 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2020-09-21 16:21:08 UTC +--- config.toml.example.orig 2021-04-22 21:08:06 UTC +++ config.toml.example @@ -2,10 +2,10 @@ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and @@ -13,15 +13,20 @@ # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" -@@ -29,13 +29,13 @@ bin_dir = "/home/git/gitaly" +@@ -28,9 +28,9 @@ bin_dir = "/home/git/gitaly" + # certificate_path = '/home/git/cert.cert' # key_path = '/home/git/key.pem' - # # Git settings +-# # Git settings -# [git] -# bin_path = "/usr/bin/git" ++# Git settings +[git] +bin_path = "%%PREFIX%%/bin/git" # catfile_cache_size = 100 + # [[git.config]] + # key = fetch.fsckObjects +@@ -38,7 +38,7 @@ bin_dir = "/home/git/gitaly" [[storage]] name = "default" @@ -30,7 +35,7 @@ # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -47,7 +47,7 @@ path = "/home/git/repositories" +@@ -50,7 +50,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 @@ -39,7 +44,7 @@ # 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 -@@ -65,7 +65,7 @@ dir = "/home/git/gitlab/log" +@@ -68,7 +68,7 @@ dir = "/home/git/gitlab/log" [gitaly-ruby] # The directory where gitaly-ruby is installed @@ -48,7 +53,7 @@ # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 200000000 -@@ -85,14 +85,14 @@ dir = "/home/git/gitaly/ruby" +@@ -88,14 +88,14 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed |