[arch-commits] Commit in gitlab-gitaly/trunk (PKGBUILD configs.patch)

[Anatol Pomozov]

    Date: Sunday, June 21, 2020 @ 18:54:10
  Author: anatolik
Revision: 650253

upgpkg: gitlab-gitaly 13.1.0-1

Modified:
  gitlab-gitaly/trunk/PKGBUILD
  gitlab-gitaly/trunk/configs.patch

---------------+
 PKGBUILD      |   12 +++---------
 configs.patch |   22 +++++++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-21 18:53:53 UTC (rev 650252)
+++ PKGBUILD	2020-06-21 18:54:10 UTC (rev 650253)
@@ -4,7 +4,7 @@
 # commit log for an old fix on how to tell it to use older versions of Ruby. I'm afraid we'll
 # need this again at some point in the future.
 pkgname=gitlab-gitaly
-pkgver=13.0.5
+pkgver=13.1.0
 pkgrel=1
 pkgdesc="Speed up Git access using caching"
 arch=('x86_64')
@@ -16,12 +16,10 @@
 backup=("etc/gitlab-gitaly/config.toml")
 _tag=v${pkgver}
 source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz"
-        "ruby27.patch::https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2227.patch"
         "configs.patch"
         "gitlab-gitaly.service")
-sha512sums=('04c0e12cf01ba3917bfb1e44029b467eecda25603a34c6eb1dec92f0b23c6e9179f8085169faeb968c8974caebe4b1c73b14e12e4898c2beead98640b74de565'
-            '76ed13110aab0bf5075eebd45c97e2c2499e0f035dfd51a9e20f95f968f8d4d3c2ad7b097b0590b7a70e6b61f783cc3aab5517b0bcf02acc7b02833c1a88ef0c'
-            '28bfb8f290d6d6206b75e2f35d8fd15b298baa005b533648550f224c6bf4fd16eeda4e2b8ff3231873ef208172f391a553956684f81867451bc08b7ad18d581f'
+sha512sums=('f9c5ddf4de13a3e64bbfef367e8b431a3224c3b2a97f11e7abe1037406526c7e319d238dcc16fc7bd5f4f3690f6574eff2956691bde75086fd7c1da52db727da'
+            '6565b3dbed2653c31d5a49043dd8227812d9c8a1f6d716ed65fed5878b9c9bd6def84e8b00ff23ddb37d8bf2f484ecb229dcb1528e8276fff7fbbb1099790850'
             'e6c31cab200424af118ee9da4def0963a52727f33025fdbdb515c6c1337a9b32f4a377bd925fdd33ffe7b91371ce1d5d70847e07c2b73eac1e85d3f38f5e1261')
 
 prepare() {
@@ -30,8 +28,6 @@
   patch -p1 < ../configs.patch
   # At this point the config file should not contain any references to '/home/git'
 
-  patch -p1 < ../ruby27.patch
-
   # https://github.com/bundler/bundler/issues/6882
   sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock
 }
@@ -55,5 +51,3 @@
   install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service"
 }
-
-# vim:set ts=2 sw=2 et:

Modified: configs.patch
===================================================================
--- configs.patch	2020-06-21 18:53:53 UTC (rev 650252)
+++ configs.patch	2020-06-21 18:54:10 UTC (rev 650253)
@@ -1,4 +1,4 @@
-commit e70c0ab485e0ee789ae2d3c2657f8b3ad5f2a6db
+commit 487d724f098441298088e59805af2faba7843fbe
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Tue May 26 00:26:02 2020 -0700
 
@@ -15,7 +15,7 @@
     will cause a conflict that needs to be reviewed manually.
 
 diff --git a/config.toml.example b/config.toml.example
-index aaab83c2..46bbad26 100644
+index 85fbf6ba..9f8e6c99 100644
 --- a/config.toml.example
 +++ b/config.toml.example
 @@ -2,10 +2,10 @@
@@ -78,18 +78,22 @@
  
  # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
  # max_rss = 200000000
-@@ -85,10 +85,10 @@ dir = "/home/git/gitaly/ruby"
+@@ -85,14 +85,14 @@ dir = "/home/git/gitaly/ruby"
  
  [gitlab-shell]
  # The directory where gitlab-shell is installed
 -dir = "/home/git/gitlab-shell"
--secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
++dir = "/usr/share/webapps/gitlab-shell"
+ 
+ [hooks]
 -custom_hooks_dir = "/home/git/custom_hooks"
--gitlab_url = "http://localhost:8080"
-+dir = "/usr/share/webapps/gitlab-shell"
-+secret_file = "/etc/webapps/gitlab-shell/secret"
 +custom_hooks_dir = "/var/lib/gitlab/custom_hooks"
-+gitlab_url = "http+unix://%2Frun%2Fgitlab%2Fgitlab.socket"
  
- [gitlab-shell.http-settings]
+ [gitlab]
+-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
+-url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
++secret_file = "/etc/webapps/gitlab-shell/secret"
++url = "http+unix://%2Frun%2Fgitlab%2Fgitlab.socket"
+ 
+ [gitlab.http-settings]
  # read_timeout = 300