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

2020-10-26 Thread Anatol Pomozov via arch-commits 
Date: Monday, October 26, 2020 @ 18:53:50
  Author: anatolik
Revision: 734021

upgpkg: gitlab-gitaly 13.5.1-1

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

---+
 PKGBUILD  |8 
 configs.patch |   10 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-26 18:34:13 UTC (rev 734020)
+++ PKGBUILD2020-10-26 18:53:50 UTC (rev 734021)
@@ -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.3.4
+pkgver=13.5.1
 pkgrel=1
 pkgdesc="Speed up Git access using caching"
 arch=('x86_64')
@@ -12,14 +12,14 @@
 license=('MIT')
 depends=(glibc ruby libxml2 libxslt libssh2)
 options=(!buildflags)
-makedepends=(go ruby-bundler cmake)
+makedepends=(go ruby-bundler cmake git)
 backup=("etc/gitlab-gitaly/config.toml")
 _tag=v${pkgver}
 
source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz;
 "configs.patch"
 "gitlab-gitaly.service")
-sha512sums=('4d4dfa3902df518c00d97f0f62a401d903505058fca3f8007d53b59a673d3187764cf59d3e49a67a1e37ea9a26e26b7ebf26332d6d8e3784cb1cd930f865e16a'
-
'6565b3dbed2653c31d5a49043dd8227812d9c8a1f6d716ed65fed5878b9c9bd6def84e8b00ff23ddb37d8bf2f484ecb229dcb1528e8276fff7fbbb1099790850'
+sha512sums=('0295ff617052c02af1fa69a249d488f0b7f225f8824894fe289b76d9f0cf40589db45e98825ccaee9450cf39c2368b6d22ca40a7bb8368dca2446effee52459e'
+
'1b83abe2034a195c33a6dbb7907f93d33b53bd94dc983be5dee5533a1e61cc41fd5228e04dcd2b2576a87a371bf5ab7c81212262421ee7c6ec46c949da4c1153'
 
'7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09')
 
 prepare() {

Modified: configs.patch
===
--- configs.patch   2020-10-26 18:34:13 UTC (rev 734020)
+++ configs.patch   2020-10-26 18:53:50 UTC (rev 734021)
@@ -1,4 +1,4 @@
-commit 487d724f098441298088e59805af2faba7843fbe
+commit 438448e3b000359b1c9ec16d2918605888f5903e
 Author: Anatol Pomozov 
 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 85fbf6ba..9f8e6c99 100644
+index befe90a3..d4317462 100644
 --- a/config.toml.example
 +++ b/config.toml.example
 @@ -2,10 +2,10 @@
@@ -94,6 +94,6 @@
 -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
+ # Only needed if a UNIX socket is used in `url` and GitLab is configured to
+ # use a relative path (e.g. /gitlab).
+ # relative_url_root = '/'

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

2020-06-21 Thread Anatol Pomozov via arch-commits 
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
===
--- PKGBUILD2020-06-21 18:53:53 UTC (rev 650252)
+++ PKGBUILD2020-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 
 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 = 2
-@@ -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

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

2020-05-26 Thread Anatol Pomozov via arch-commits 
Date: Tuesday, May 26, 2020 @ 08:42:37
  Author: anatolik
Revision: 635013

upgpkg: gitlab-gitaly 13.0.0-2: FS#66774 Adjust configs for the new file 
locations

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

---+
 PKGBUILD  |   20 ---
 configs.patch |   95 
 2 files changed, 102 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-26 08:33:27 UTC (rev 635012)
+++ PKGBUILD2020-05-26 08:42:37 UTC (rev 635013)
@@ -5,7 +5,7 @@
 # need this again at some point in the future.
 pkgname=gitlab-gitaly
 pkgver=13.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Speed up Git access using caching"
 arch=('x86_64')
 url="https://gitlab.com/gitlab-org/gitaly;
@@ -16,18 +16,17 @@
 backup=("etc/gitlab-gitaly/config.toml")
 _tag=v${pkgver}
 
source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz;
+"configs.patch"
 "gitlab-gitaly.service")
 
sha512sums=('dc8cac8fec10e1d60acc192478a718ee8f0e059f84cfbfea77ff33f109b41aa26e6a232a948830598926d648170b3fff2116139d9c184ec398f295c1cc3a77a5'
+
'28bfb8f290d6d6206b75e2f35d8fd15b298baa005b533648550f224c6bf4fd16eeda4e2b8ff3231873ef208172f391a553956684f81867451bc08b7ad18d581f'
 
'e6c31cab200424af118ee9da4def0963a52727f33025fdbdb515c6c1337a9b32f4a377bd925fdd33ffe7b91371ce1d5d70847e07c2b73eac1e85d3f38f5e1261')
 
-_homedir="/var/lib/gitlab"
-
 prepare() {
   cd gitaly-$_tag
 
-  sed -i "s|dir = \"/home/git/gitaly/ruby\"|dir = 
\"/usr/share/webapps/gitlab-gitaly/ruby\"|" config.toml.example
-  sed -i "s|dir = \"/home/git/gitlab-shell\"|dir = 
\"/usr/share/webapps/gitlab-shell\"|" config.toml.example
-  sed -i "s|bin_dir = \"/home/git/gitaly\"|bin_dir = \"/usr/bin\"|" 
config.toml.example
+  patch -p1 < ../configs.patch
+  # At this point the config file should not contain any references to 
'/home/git'
 
   # https://github.com/bundler/bundler/issues/6882
   sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock
@@ -44,16 +43,11 @@
   cd gitaly-$_tag
 
   make PREFIX=/usr DESTDIR=${pkgdir} install
-  mkdir -p "${pkgdir}/etc/${pkgname}"
-  sed \
--e "s|^socket_path =.*|socket_path = 
\"${_homedir}/sockets/gitlab-gitaly.socket\"|" \
--e "s|^path =.*|path = \"${_homedir}/repositories\"|" \
-config.toml.example > "${pkgdir}/etc/${pkgname}/config.toml"
-
+  mkdir -p ${pkgdir}/etc/gitlab-gitaly
   mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly
   cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby
 
-  install -Dm644 config.toml.example 
"${pkgdir}/usr/share/${pkgname}/config.toml.example"
+  install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml"
   install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -Dm0644 "${srcdir}/gitlab-gitaly.service" 
"${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service"
 }

Added: configs.patch
===
--- configs.patch   (rev 0)
+++ configs.patch   2020-05-26 08:42:37 UTC (rev 635013)
@@ -0,0 +1,95 @@
+commit e70c0ab485e0ee789ae2d3c2657f8b3ad5f2a6db
+Author: Anatol Pomozov 
+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 aaab83c2..46bbad26 100644
+--- a/config.toml.example
 b/config.toml.example
+@@ -2,10 +2,10 @@
+ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
+ # https://docs.gitlab.com/ee//administration/gitaly/reference
+ 
+-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
++socket_path = "/run/gitlab/gitlab-gitaly.socket"
+ 
+ # The directory where Gitaly's executables are stored
+-bin_dir = "/home/git/gitaly"
++bin_dir = "/usr/bin"
+ 
+ # # Optional: listen on a TCP socket. This is insecure (no authentication)
+ # listen_addr = "localhost:"
+@@ -17,7 +17,7 @@ bin_dir = "/home/git/gitaly"
+ # # 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.
+ # # Non Gitaly clients should never connect to these sockets.
+-# internal_socket_dir = "/home/git/gitlab/tmp/sockets/private/internal"
++# internal_socket_dir = "/run/gitlab/private"
+ 
+ # # Optional: