automatic version update by autodist [release 14.4.5-1mamba;Tue May 31 2022]
This commit is contained in:
parent
484d0e4319
commit
cd93989d94
@ -1,23 +1,5 @@
|
|||||||
commit 438448e3b000359b1c9ec16d2918605888f5903e
|
--- gitaly-v14.4.5/config.toml.example.orig 2022-05-30 20:41:16.969740391 +0200
|
||||||
Author: Anatol Pomozov <anatol.pomozov@gmail.com>
|
+++ gitaly-v14.4.5/config.toml.example 2022-05-30 20:48:21.953354136 +0200
|
||||||
Date: Tue May 26 00:26:02 2020 -0700
|
|
||||||
|
|
||||||
Patch config files with Arch Linux specific locations
|
|
||||||
|
|
||||||
Arch uses upstream's default config files as a base for its configs.
|
|
||||||
But directory structure at Arch is completely different from the default
|
|
||||||
one specified by gitlab project.
|
|
||||||
We used to have a lot of seds expressions to adjust the files but as
|
|
||||||
complexity of configs grew 'sed' makes it easy to miss a changed/added
|
|
||||||
option.
|
|
||||||
|
|
||||||
Track set of diffs as a patch. If upstream modifies config file then it
|
|
||||||
will cause a conflict that needs to be reviewed manually.
|
|
||||||
|
|
||||||
diff --git a/config.toml.example b/config.toml.example
|
|
||||||
index befe90a3..d4317462 100644
|
|
||||||
--- a/config.toml.example
|
|
||||||
+++ b/config.toml.example
|
|
||||||
@@ -2,10 +2,10 @@
|
@@ -2,10 +2,10 @@
|
||||||
# Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
|
# Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
|
||||||
# https://docs.gitlab.com/ee//administration/gitaly/reference
|
# https://docs.gitlab.com/ee//administration/gitaly/reference
|
||||||
@ -26,12 +8,12 @@ index befe90a3..d4317462 100644
|
|||||||
+socket_path = "/run/gitlab/gitlab-gitaly.socket"
|
+socket_path = "/run/gitlab/gitlab-gitaly.socket"
|
||||||
|
|
||||||
# The directory where Gitaly's executables are stored
|
# The directory where Gitaly's executables are stored
|
||||||
-bin_dir = "/home/git/gitaly"
|
-bin_dir = "/home/git/gitaly/_build/bin"
|
||||||
+bin_dir = "/usr/bin"
|
+bin_dir = "/usr/bin"
|
||||||
|
|
||||||
# # Optional: listen on a TCP socket. This is insecure (no authentication)
|
# # Optional: listen on a TCP socket. This is insecure (no authentication)
|
||||||
# listen_addr = "localhost:9999"
|
# listen_addr = "localhost:9999"
|
||||||
@@ -17,7 +17,7 @@ bin_dir = "/home/git/gitaly"
|
@@ -17,7 +17,7 @@
|
||||||
# # 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.
|
||||||
@ -40,7 +22,7 @@ index befe90a3..d4317462 100644
|
|||||||
|
|
||||||
# # Optional: authenticate Gitaly requests using a shared secret
|
# # Optional: authenticate Gitaly requests using a shared secret
|
||||||
# [auth]
|
# [auth]
|
||||||
@@ -25,8 +25,8 @@ bin_dir = "/home/git/gitaly"
|
@@ -25,8 +25,8 @@
|
||||||
# transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication.
|
# transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication.
|
||||||
|
|
||||||
# [tls]
|
# [tls]
|
||||||
@ -51,7 +33,7 @@ index befe90a3..d4317462 100644
|
|||||||
|
|
||||||
# # Git settings
|
# # Git settings
|
||||||
# [git]
|
# [git]
|
||||||
@@ -35,7 +35,7 @@ bin_dir = "/home/git/gitaly"
|
@@ -38,7 +38,7 @@
|
||||||
|
|
||||||
[[storage]]
|
[[storage]]
|
||||||
name = "default"
|
name = "default"
|
||||||
@ -60,7 +42,7 @@ index befe90a3..d4317462 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
|
||||||
#
|
#
|
||||||
@@ -47,7 +47,7 @@ path = "/home/git/repositories"
|
@@ -50,7 +50,7 @@
|
||||||
# # 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
|
||||||
@ -69,7 +51,7 @@ index befe90a3..d4317462 100644
|
|||||||
# format = "json"
|
# format = "json"
|
||||||
# # 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
|
||||||
@@ -65,7 +65,7 @@ dir = "/home/git/gitlab/log"
|
@@ -68,7 +68,7 @@
|
||||||
|
|
||||||
[gitaly-ruby]
|
[gitaly-ruby]
|
||||||
# The directory where gitaly-ruby is installed
|
# The directory where gitaly-ruby is installed
|
||||||
@ -78,7 +60,7 @@ index befe90a3..d4317462 100644
|
|||||||
|
|
||||||
# # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
|
# # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
|
||||||
# max_rss = 200000000
|
# max_rss = 200000000
|
||||||
@@ -85,14 +85,14 @@ dir = "/home/git/gitaly/ruby"
|
@@ -88,14 +88,14 @@
|
||||||
|
|
||||||
[gitlab-shell]
|
[gitlab-shell]
|
||||||
# The directory where gitlab-shell is installed
|
# The directory where gitlab-shell is installed
|
@ -1,5 +1,5 @@
|
|||||||
Name: gitlab-gitaly
|
Name: gitlab-gitaly
|
||||||
Version: 13.12.4
|
Version: 14.4.5
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: Speed up Git access using caching
|
Summary: Speed up Git access using caching
|
||||||
Group: Applications/Web
|
Group: Applications/Web
|
||||||
@ -9,7 +9,7 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
|||||||
URL: https://gitlab.com/gitlab-org/gitaly
|
URL: https://gitlab.com/gitlab-org/gitaly
|
||||||
Source: https://gitlab.com/gitlab-org/gitaly/-/archive/v%{version}/gitaly-v%{version}.tar.gz
|
Source: https://gitlab.com/gitlab-org/gitaly/-/archive/v%{version}/gitaly-v%{version}.tar.gz
|
||||||
Source1: gitlab-gitaly.service
|
Source1: gitlab-gitaly.service
|
||||||
Patch0: gitlab-gitaly-configs.patch
|
Patch0: gitlab-gitaly-14.4.5-configs.patch
|
||||||
License: MIT
|
License: MIT
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
@ -26,7 +26,7 @@ Speed up Git access using caching.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n gitaly-v%{version}
|
%setup -q -n gitaly-v%{version}
|
||||||
%patch0 -p1
|
#%patch0 -p1
|
||||||
# https://github.com/bundler/bundler/issues/6882
|
# https://github.com/bundler/bundler/issues/6882
|
||||||
sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock
|
sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock
|
||||||
|
|
||||||
@ -71,6 +71,9 @@ install -Dm644 %{SOURCE1} %{buildroot}%{_unitdir}/gitlab-gitaly.service
|
|||||||
%doc LICENSE
|
%doc LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 31 2022 Automatic Build System <autodist@mambasoft.it> 14.4.5-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Wed Jun 16 2021 Automatic Build System <autodist@mambasoft.it> 13.12.4-1mamba
|
* Wed Jun 16 2021 Automatic Build System <autodist@mambasoft.it> 13.12.4-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user