forge/ayaports
1
0
Fork 0
Code Issues 43 Pull requests 15 Projects Releases Packages 460 Wiki Activity Actions

user/gitaly: upgrade to 16.7.3

Browse source
This commit is contained in:
Antoine Martin 2024-01-20 23:09:22 -05:00
parent 3a1419cdf2
commit 2ff1536f38
Signed by: forge
GPG key ID: D62A472A4AA7D541
2 changed files with 36 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
user/gitaly/APKBUILD
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.6.4 pkgver=16.7.3
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="
e83ad1470000700021495b61e991156bee511d7f94e3e07ec325f1cf5ce000cd8b5e3f8af574ced6499e9487ace43617fcb76dad61c871327bb693d364508d4a gitaly-v16.6.4.tar.gz 0ea3f4635b6c3f721c43b60e7e814d0895309fd8d4e35440fc6c39d821de33d40435bed8f09a6419fee658bec22bb0e23b2ae1a5962e37992c5f3823534a87ad gitaly-v16.7.3.tar.gz
55230e587839df8fc8c6daeee1e5a5fbd91d6d28966d9977d59e6fb3d75e269c9d4d119f3a06217a4c6c55733a50ec9affcdb132e77e1694df839269dcd292aa config.patch 0e65e620bde43a74123a281e26e85cc963a42f7113d6063511938cf828221491095ac6de7f146d9d514336597c2c1be8a21cb750871ed4a70692c6db7c44a22c config.patch
c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd
" "

77
user/gitaly/config.patch
View file

@ -1,84 +1,73 @@
diff --git a/config.toml.example.orig b/config.toml.example diff --git a/config.toml.example.orig b/config.toml.example
index 3d454fb..52457df 100644 index d878b16..6bb7fd9 100644
--- a/config.toml.example.orig --- a/config.toml.example.orig
+++ b/config.toml.example +++ b/config.toml.example
@@ -2,15 +2,15 @@ @@ -2,19 +2,24 @@
# Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and # For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/
# https://docs.gitlab.com/ee//administration/gitaly/reference
# 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"
+socket_path = "/run/gitlab/gitaly.socket" +socket_path = "/run/gitlab/gitaly.socket"
# The directory where Gitaly's executables are stored # Directory containing Gitaly executables.
-bin_dir = "/home/git/gitaly/_build/bin" -bin_dir = "/home/git/gitaly/_build/bin"
+bin_dir = "/usr/bin" +bin_dir = "/usr/bin"
-# # Optional: The directory where Gitaly can create all files required to # # Optional. The directory where Gitaly can create all files required to
-# # properly operate at runtime. If not set, Gitaly will create a directory in # # properly operate at runtime. If not set, Gitaly will create a directory in
-# # the global temporary directory. This directory must exist. # # the global temporary directory. This directory must exist.
-# runtime_dir = "/home/git/gitaly/run" -# 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" +runtime_dir = "/run/gitaly"
# # Optional: listen on a TCP socket. This is insecure (no authentication) # # Optional if socket_path is set. TCP address for Gitaly to listen on. This is insecure (unencrypted connection).
# listen_addr = "localhost:9999" # 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 +# # 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. +# # named temp directory each time it boots.
# # Non Gitaly clients should never connect to these sockets. +# # 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" +internal_socket_dir = "/run/gitaly/internal"
+
# # Optional. TCP over TLS address for Gitaly to listen on.
# tls_listen_addr = "localhost:8888"
# # Optional: authenticate Gitaly requests using a shared secret @@ -35,9 +40,9 @@ bin_dir = "/home/git/gitaly/_build/bin"
# [auth] # # Gitaly supports TLS encryption. You must bring your own certificates because this isn’t provided automatically.
@@ -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] # [tls]
# # Path to the certificate.
-# certificate_path = '/home/git/cert.cert' -# certificate_path = '/home/git/cert.cert'
-# key_path = '/home/git/key.pem'
+# certificate_path = '/etc/gitlab/ssl/gitaly.crt' +# certificate_path = '/etc/gitlab/ssl/gitaly.crt'
# # Path to the key.
-# key_path = '/home/git/key.pem'
+# key_path = '/etc/gitlab/ssl/gitaly.key' +# key_path = '/etc/gitlab/ssl/gitaly.key'
# # Git settings # # Git settings
# [git] # [git]
@@ -44,7 +44,7 @@ bin_dir = "/home/git/gitaly/_build/bin" @@ -53,7 +58,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
# # The name of the storage
[[storage]]
name = "default" name = "default"
# # The path to the storage.
-path = "/home/git/repositories" -path = "/home/git/repositories"
+path = "/var/lib/gitlab/repositories" +path = "/var/lib/gitlab/repositories"
# # 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
# #
@@ -54,15 +54,15 @@ path = "/home/git/repositories" @@ -65,12 +70,12 @@ path = "/home/git/repositories"
#
# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
-# [logging] # [logging]
-# # The directory where Gitaly stores extra log files # # The directory where Gitaly stores extra log files
-dir = "/home/git/gitlab/log" -dir = "/home/git/gitlab/log"
-# format = "json" -# 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" +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 # # One of, in order: debug, info, warn, errror, fatal, panic
+# Defaults to "info" # # Defaults to "info"
-# level = "warn"
+level = "warn" +level = "warn"
+ #
# # Additionally exceptions from the Go server can be reported to Sentry # # Additionally exceptions from the Go server can be reported to Sentry
# 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"
@@ -71,11 +71,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] # 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] [hooks]