user/gitaly: upgrade to 16.8.0

This commit is contained in:
Antoine Martin 2024-01-21 18:47:51 -05:00
parent 31ee2bf5ce
commit aa3219fa5f
Signed by: forge
GPG key ID: D62A472A4AA7D541
2 changed files with 29 additions and 22 deletions

View file

@ -2,7 +2,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitaly pkgname=gitaly
pkgver=16.7.3 pkgver=16.8.0
pkgrel=0 pkgrel=0
pkgdesc="A Git RPC service for handling all the git calls made by GitLab" pkgdesc="A Git RPC service for handling all the git calls made by GitLab"
url="https://gitlab.com/gitlab-org/gitaly/" url="https://gitlab.com/gitlab-org/gitaly/"
@ -80,7 +80,7 @@ praefect() {
} }
sha512sums=" sha512sums="
0ea3f4635b6c3f721c43b60e7e814d0895309fd8d4e35440fc6c39d821de33d40435bed8f09a6419fee658bec22bb0e23b2ae1a5962e37992c5f3823534a87ad gitaly-v16.7.3.tar.gz 5867b328d0086e4a3135e8d66b778d1c7ee1a0abfaed1bbeecaa1876c7fcc5ec369baa6b0303522f3cf8c97c809a8263256e56844c9fae8583331efc2498b104 gitaly-v16.8.0.tar.gz
0e65e620bde43a74123a281e26e85cc963a42f7113d6063511938cf828221491095ac6de7f146d9d514336597c2c1be8a21cb750871ed4a70692c6db7c44a22c config.patch 7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch
c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd
" "

View file

@ -1,9 +1,9 @@
diff --git a/config.toml.example.orig b/config.toml.example diff --git a/config.toml.example.orig b/config.toml.example
index d878b16..6bb7fd9 100644 index 82b8502..9982087 100644
--- a/config.toml.example.orig --- a/config.toml.example.orig
+++ b/config.toml.example +++ b/config.toml.example
@@ -2,19 +2,24 @@ @@ -2,19 +2,24 @@
# For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/ # For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/.
# A path which Gitaly should open a Unix socket. # A path which Gitaly should open a Unix socket.
-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
@ -42,7 +42,7 @@ index d878b16..6bb7fd9 100644
# # Git settings # # Git settings
# [git] # [git]
@@ -53,7 +58,7 @@ bin_dir = "/home/git/gitaly/_build/bin" @@ -58,7 +63,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
# # The name of the storage # # The name of the storage
name = "default" name = "default"
# # The path to the storage. # # The path to the storage.
@ -51,34 +51,41 @@ index d878b16..6bb7fd9 100644
# # You can optionally configure more storages for this Gitaly instance to serve up # # You can optionally configure more storages for this Gitaly instance to serve up
# #
@@ -65,12 +70,12 @@ path = "/home/git/repositories" @@ -70,12 +75,12 @@ path = "/home/git/repositories"
# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout # # Optional. Configure Gitaly to output JSON-formatted log messages to stdout.
# [logging] # [logging]
# # The directory where Gitaly stores extra log files # # Directory where Gitaly stores extra log files.
-dir = "/home/git/gitlab/log" -dir = "/home/git/gitlab/log"
+dir = "/vat/log/gitlab"
# # Log format. Either 'text' or 'json'.
-# format = "json" -# format = "json"
+dir = "/var/log/gitlab"
+format = "text" +format = "text"
# # Optional. Set log level to only log entries with that severity or above # # Optional. Set log level to only log entries with that severity or above.
# # One of, in order: debug, info, warn, errror, fatal, panic # # Valid values are, in order, 'debug', 'info', 'warn', 'error', 'fatal', and 'panic'. Defaults to 'info'.
# # Defaults to "info"
-# level = "warn" -# level = "warn"
+level = "warn" +level = "warn"
# # # Additionally, exceptions from the Go server can be reported to Sentry. Sentry DSN (Data Source Name)
# # Additionally exceptions from the Go server can be reported to Sentry # # for exception monitoring.
# sentry_dsn = "https://<key>:<secret>@sentry.io/<project>" # sentry_dsn = "https://<key>:<secret>@sentry.io/<project>"
@@ -80,11 +85,11 @@ dir = "/home/git/gitlab/log" @@ -91,18 +96,18 @@ sentry_environment = ""
# 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] # # Custom Git hooks that are used to perform tasks based on changes performed in any repository.
[hooks] [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 = "/home/git/custom_hooks"
+custom_hooks_dir = "/etc/gitlab/custom_hooks" +custom_hooks_dir = "/etc/gitlab/custom_hooks"
# # Gitaly must connect to the GitLab application to perform access checks when a user performs a change.
[gitlab] [gitlab]
-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" # # URL of the GitLab server.
-url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" -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" +url = "http+unix://%2Frun%2Fgitlab%2Fworkhorse.socket"
# Only needed if a UNIX socket is used in `url` and GitLab is configured to # # 'relative_url_root' is only needed if a UNIX socket is used in 'url' and GitLab is configured to
# use a relative path (e.g. /gitlab). # # use a relative path. For example, '/gitlab'.
# relative_url_root = '/' # 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 = "/etc/gitlab/gitlab_shell_secret"
# # Secret token used to authenticate with GitLab.
# secret = ""