84 lines
3.3 KiB
Diff
84 lines
3.3 KiB
Diff
diff --git a/config.toml.example.orig b/config.toml.example
|
||
index d878b16..6bb7fd9 100644
|
||
--- a/config.toml.example.orig
|
||
+++ b/config.toml.example
|
||
@@ -2,19 +2,24 @@
|
||
# For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/
|
||
|
||
# A path which Gitaly should open a Unix socket.
|
||
-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
|
||
+socket_path = "/run/gitlab/gitaly.socket"
|
||
|
||
# Directory containing Gitaly executables.
|
||
-bin_dir = "/home/git/gitaly/_build/bin"
|
||
+bin_dir = "/usr/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
|
||
# # the global temporary directory. This directory must exist.
|
||
-# runtime_dir = "/home/git/gitaly/run"
|
||
+runtime_dir = "/run/gitaly"
|
||
|
||
# # Optional if socket_path is set. TCP address for Gitaly to listen on. This is insecure (unencrypted connection).
|
||
# listen_addr = "localhost:9999"
|
||
|
||
+# # 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 = "/run/gitaly/internal"
|
||
+
|
||
# # Optional. TCP over TLS address for Gitaly to listen on.
|
||
# tls_listen_addr = "localhost:8888"
|
||
|
||
@@ -35,9 +40,9 @@ bin_dir = "/home/git/gitaly/_build/bin"
|
||
# # Gitaly supports TLS encryption. You must bring your own certificates because this isn’t provided automatically.
|
||
# [tls]
|
||
# # Path to the certificate.
|
||
-# certificate_path = '/home/git/cert.cert'
|
||
+# certificate_path = '/etc/gitlab/ssl/gitaly.crt'
|
||
# # Path to the key.
|
||
-# key_path = '/home/git/key.pem'
|
||
+# key_path = '/etc/gitlab/ssl/gitaly.key'
|
||
|
||
# # Git settings
|
||
# [git]
|
||
@@ -53,7 +58,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
|
||
# # The name of the storage
|
||
name = "default"
|
||
# # The path to the storage.
|
||
-path = "/home/git/repositories"
|
||
+path = "/var/lib/gitlab/repositories"
|
||
|
||
# # You can optionally configure more storages for this Gitaly instance to serve up
|
||
#
|
||
@@ -65,12 +70,12 @@ 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"
|
||
-# format = "json"
|
||
+dir = "/var/log/gitlab"
|
||
+format = "text"
|
||
# # Optional. Set log level to only log entries with that severity or above
|
||
# # One of, in order: debug, info, warn, errror, fatal, panic
|
||
# # Defaults to "info"
|
||
-# level = "warn"
|
||
+level = "warn"
|
||
#
|
||
# # Additionally exceptions from the Go server can be reported to Sentry
|
||
# sentry_dsn = "https://<key>:<secret>@sentry.io/<project>"
|
||
@@ -80,11 +85,11 @@ dir = "/home/git/gitlab/log"
|
||
# grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]
|
||
|
||
[hooks]
|
||
-custom_hooks_dir = "/home/git/custom_hooks"
|
||
+custom_hooks_dir = "/etc/gitlab/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 = "/etc/gitlab/gitlab_shell_secret"
|
||
+url = "http+unix://%2Frun%2Fgitlab%2Fworkhorse.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 = '/'
|