File config.patch of Package gitaly
Index: gitaly/config.toml.example =================================================================== --- gitaly.orig/config.toml.example +++ gitaly/config.toml.example @@ -2,15 +2,16 @@ # For Gitaly documentation, see https://docs.gitlab.com/administration/gitaly/. # A path which Gitaly should open a Unix socket. -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" +socket_path = "/srv/www/vhosts/gitlab-ce/tmp/sockets/private/gitaly.socket" # Directory containing Gitaly executables. -bin_dir = "/home/git/gitaly/_build/bin" +bin_dir = "/usr/lib/gitlab/gitaly/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 = "/var/lib/gitaly/" # # Optional if socket_path is set. TCP address for Gitaly to listen on. This is insecure (unencrypted connection). # listen_addr = "localhost:9999" @@ -35,7 +36,7 @@ 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/gitaly/cert.cert' # # Path to the key. # key_path = '/home/git/key.pem' # Minimum offered TLS version. Options: ["TLS 1.2", "TLS 1.3"]. @@ -43,8 +44,10 @@ bin_dir = "/home/git/gitaly/_build/bin" # # Git settings # [git] +[git] # # Path to Git binary. If not set, is resolved using PATH. # bin_path = "/usr/bin/git" +bin_path = "/usr/bin/git" # # Maximum number of cached 'cat-file' processes, which constitute a pair of 'git cat-file --batch' and # # 'git cat-file --batch-check' processes. Defaults to '100'. # catfile_cache_size = 100 @@ -60,7 +63,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 = "/srv/gitlab/repositories" # # You can optionally configure more storages for this Gitaly instance to serve up # @@ -76,6 +79,10 @@ path = "/home/git/repositories" # # Optional. Set log level to only log entries with that severity or above. # # Valid values are, in order, 'debug', 'info', 'warn', 'error', 'fatal', and 'panic'. Defaults to 'info'. # level = "warn" +[logging] +dir = "/srv/www/vhosts/gitlab-ce/log/gitaly/" +level = "warn" + # # Additionally, exceptions from the Go server can be reported to Sentry. Sentry DSN (Data Source Name) # # for exception monitoring. # sentry_dsn = "https://<key>:<secret>@sentry.io/<project>" @@ -91,18 +98,18 @@ sentry_environment = "" # # Custom Git hooks that are used to perform tasks based on changes performed in any repository. [hooks] # # Directory where custom Git hooks are installed. If left unset, no custom hooks are used. -custom_hooks_dir = "/home/git/custom_hooks" +custom_hooks_dir = "/usr/share/gitlab/custom_hooks/" # # Gitaly must connect to the GitLab application to perform access checks when a user performs a change. [gitlab] # # URL of the GitLab server. -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" +url = "http+unix://%2Fsrv%2Fwww%2Fvhosts%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" # # 'relative_url_root' is only needed if a UNIX socket is used in 'url' and GitLab is configured to # # use a relative path. For example, '/gitlab'. # relative_url_root = '/' # # Path of the file containing the secret token used to authenticate with GitLab. Use either 'secret_token' or 'secret' # # but not both. -secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" +secret_file = "/usr/lib/gitlab/shell/.gitlab_shell_secret" # # Secret token used to authenticate with GitLab. # secret = ""
