--- config.toml.example.orig 2020-09-21 16:21:08 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" +bin_dir = "%%PREFIX%%/share/gitaly/bin/" # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" @@ -29,13 +29,13 @@ bin_dir = "/home/git/gitaly" # key_path = '/home/git/key.pem' # # Git settings -# [git] -# bin_path = "/usr/bin/git" +[git] +bin_path = "%%PREFIX%%/bin/git" # catfile_cache_size = 100 [[storage]] name = "default" -path = "/home/git/repositories" +path = "%%PREFIX%%/git/repositories" # # You can optionally configure more storages for this Gitaly instance to serve up # @@ -47,7 +47,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 @@ -65,7 +65,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 @@ -85,14 +85,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 = '/'