diff --git a/config.toml.example.orig b/config.toml.example index 2ddb368..0a8a0e2 100644 --- a/config.toml.example.orig +++ b/config.toml.example @@ -2,15 +2,15 @@ # 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 = "/run/gitlab/gitaly.socket" # The directory where Gitaly's executables are stored -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" +# 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 = "/run/gitaly" # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" @@ -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 = "/run/gitaly/internal" # # Optional: authenticate Gitaly requests using a shared secret # [auth] @@ -30,8 +30,8 @@ bin_dir = "/home/git/gitaly/_build/bin" # transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication. # [tls] -# certificate_path = '/home/git/cert.cert' -# key_path = '/home/git/key.pem' +# certificate_path = '/etc/gitlab/ssl/gitaly.crt' +# key_path = '/etc/gitlab/ssl/gitaly.key' # # Git settings # [git] @@ -44,7 +44,7 @@ bin_dir = "/home/git/gitaly/_build/bin" [[storage]] name = "default" -path = "/home/git/repositories" +path = "/var/lib/gitlab/repositories" # # You can optionally configure more storages for this Gitaly instance to serve up # @@ -54,15 +54,15 @@ 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" -# # 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" -# +[logging] +# The directory where Gitaly stores extra log files +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" + # # Additionally exceptions from the Go server can be reported to Sentry # sentry_dsn = "https://:@sentry.io/" @@ -72,14 +72,14 @@ dir = "/home/git/gitlab/log" [gitlab-shell] # The directory where gitlab-shell is installed -dir = "/home/git/gitlab-shell" +dir = "/usr/lib/gitlab-shell" -[hooks] -custom_hooks_dir = "/home/git/custom_hooks" +# [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 = '/'