65 lines
2.2 KiB
Text
65 lines
2.2 KiB
Text
--- config.toml.example.orig 2020-05-21 17:02:13 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 = "/usr/local/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,10 +85,10 @@ dir = "/home/git/gitaly/ruby"
|
|
|
|
[gitlab-shell]
|
|
# The directory where gitlab-shell is installed
|
|
-dir = "/home/git/gitlab-shell"
|
|
-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
|
|
-custom_hooks_dir = "/home/git/custom_hooks"
|
|
-gitlab_url = "http://localhost:8080"
|
|
+dir = "%%PREFIX%%/share/gitlab-shell"
|
|
+secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret"
|
|
+custom_hooks_dir = "%%PREFIX%%/git/custom_hooks"
|
|
+gitlab_url = "https://_change_to_gitlab_url_"
|
|
|
|
[gitlab-shell.http-settings]
|
|
# read_timeout = 300
|