[arch-commits] Commit in gitlab-shell/repos (6 files)

Anatol Pomozov anatolik at archlinux.org
Tue May 26 08:33:28 UTC 2020


    Date: Tuesday, May 26, 2020 @ 08:33:27
  Author: anatolik
Revision: 635012

archrelease: copy trunk to community-testing-x86_64

Added:
  gitlab-shell/repos/community-testing-x86_64/
  gitlab-shell/repos/community-testing-x86_64/PKGBUILD
    (from rev 635011, gitlab-shell/trunk/PKGBUILD)
  gitlab-shell/repos/community-testing-x86_64/configs.patch
    (from rev 635011, gitlab-shell/trunk/configs.patch)
  gitlab-shell/repos/community-testing-x86_64/gitlab-shell.gitconfig
    (from rev 635011, gitlab-shell/trunk/gitlab-shell.gitconfig)
  gitlab-shell/repos/community-testing-x86_64/gitlab-shell.install
    (from rev 635011, gitlab-shell/trunk/gitlab-shell.install)
  gitlab-shell/repos/community-testing-x86_64/gitlab-shell.sysusers
    (from rev 635011, gitlab-shell/trunk/gitlab-shell.sysusers)

------------------------+
 PKGBUILD               |  100 +++++++++++++++++++++++++++++++++++++++++++++++
 configs.patch          |   57 ++++++++++++++++++++++++++
 gitlab-shell.gitconfig |    5 ++
 gitlab-shell.install   |    9 ++++
 gitlab-shell.sysusers  |    1 
 5 files changed, 172 insertions(+)

Copied: gitlab-shell/repos/community-testing-x86_64/PKGBUILD (from rev 635011, gitlab-shell/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2020-05-26 08:33:27 UTC (rev 635012)
@@ -0,0 +1,100 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: Pavol (Lopo) Hluchy <lopo AT losys DOT eu>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Jonas Heinrich <onny at project-insnaity.org>
+# Contributor: Lee Watson <aur at revthefox.co.uk>
+# Contributor: Tobias Hunger <tobias DOT hunger AT gmail DOT com>
+# Contributor: Stefan Tatschner <stefan at sevenbyte.org>
+
+
+# NOTE: Gitlab isn't always compatible with modern Ruby versions. In that case, check the
+# 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-shell
+pkgver=13.2.0
+pkgrel=2
+epoch=2
+pkgdesc="Git management software"
+arch=('x86_64')
+url="https://gitlab.com/gitlab-org/gitlab-shell/"
+license=('MIT')
+depends=('ruby' 'redis' 'git')
+makedepends=('go')
+options=('!strip')
+install=gitlab-shell.install
+backup=("etc/webapps/${pkgname}/config.yml"
+        "etc/webapps/${pkgname}/secret"
+        "etc/webapps/${pkgname}/.gitconfig")
+source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitlab-shell/-/archive/v${pkgver}/gitlab-shell-v${pkgver}.tar.gz"
+        "configs.patch"
+        "gitlab-shell.gitconfig"
+        "gitlab-shell.sysusers")
+sha512sums=('75aa095b4912a7ce7e7523a454cb32b543cb3e0061cba8c5346cf2837b486dee49fad855d73086ad7a303cfd9e47f4119e2d3806deaab0bea0bd745f0122fd61'
+            'd419883949c6aaa1fec8e251b82db845483a439df3f743a0370a547449a271bd8e197d93bf6f83d6610f12dbdc4ea17956ae7af1447ac44bd92b73036bb9cd05'
+            '5caafe5300621ced58479e724b39656afc17f32a64ecde5dfa4919683ef37d9121552c78f066678472acb56e0a34b5c3cf34d9b44414d1ed5d91f725d180fa43'
+            '616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8')
+
+_datadir="/usr/share/webapps/${pkgname}"
+_etcdir="/etc/webapps/${pkgname}"
+_homedir="/var/lib/gitlab"
+_logdir="/var/log/gitlab"
+_srcdir="gitlab-shell-v${pkgver}"
+
+prepare() {
+  cd "${srcdir}/${_srcdir}"
+
+  patch -p1 < ../configs.patch
+  # At this point config file should not contain any references to '/home/git'
+}
+
+build() {
+  cd "${srcdir}/${_srcdir}"
+
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  make build
+}
+
+package() {
+  cd "${srcdir}/${_srcdir}"
+
+  install -dm755 -o root -g root "${pkgdir}${_datadir}"
+  install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}"
+  install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}/satellites"
+  install -dm700 -o 105 -g 105 "${pkgdir}${_homedir}/.ssh"
+  install -dm750 -o 105 -g 105 "${pkgdir}${_etcdir}"
+  install -dm770 -o 105 -g root "${pkgdir}${_logdir}"
+
+  # sysusers
+  install -Dm644 "${srcdir}/gitlab-shell.sysusers" "${pkgdir}/usr/lib/sysusers.d/gitlab-shell.conf"
+
+  # .gitconfig
+  install -Dm644 -o 105 -g 105 "${srcdir}/gitlab-shell.gitconfig" "${pkgdir}${_etcdir}/.gitconfig"
+  ln -fs "${_etcdir}/.gitconfig" "${pkgdir}${_homedir}/.gitconfig"
+
+  # .gitlab_shell_secret
+  touch "${pkgdir}${_etcdir}/secret"
+  chmod 640 "${pkgdir}${_etcdir}/secret"
+  chown root:105 "${pkgdir}${_etcdir}/secret"
+  ln -fs "${_etcdir}/secret" "${pkgdir}${_datadir}/.gitlab_shell_secret"
+
+  # config.yml
+  install -Dm644 config.yml.example "${pkgdir}${_etcdir}/config.yml"
+  ln -fs "${_etcdir}/config.yml" "${pkgdir}${_datadir}/config.yml"
+
+  cp -r VERSION bin hooks spec support "${pkgdir}${_datadir}"
+  ln -fs "${_datadir}" "${pkgdir}/${_homedir}/"
+
+  # Compatibility for FS#64251
+  ln -s gitlab-shell "$pkgdir"/${_datadir}/bin/gitlab-shell-ruby
+
+  install -dm2770 -o 105 -g 105 "${pkgdir}${_homedir}/repositories"
+
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: gitlab-shell/repos/community-testing-x86_64/configs.patch (from rev 635011, gitlab-shell/trunk/configs.patch)
===================================================================
--- community-testing-x86_64/configs.patch	                        (rev 0)
+++ community-testing-x86_64/configs.patch	2020-05-26 08:33:27 UTC (rev 635012)
@@ -0,0 +1,57 @@
+commit 589384cfc1f10d818c531efa9c8d572532484278
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date:   Tue May 26 00:39:46 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.yml.example b/config.yml.example
+index 658839d..145a12a 100644
+--- a/config.yml.example
++++ b/config.yml.example
+@@ -4,7 +4,7 @@
+ #
+ 
+ # GitLab user. git by default
+-user: git
++user: gitlab
+ 
+ # URL to GitLab instance, used for API calls. Default: http://localhost:8080.
+ # For relative URL support read http://doc.gitlab.com/ce/install/relative_url.html
+@@ -13,7 +13,7 @@ user: git
+ # only listen on a Unix domain socket. For Unix domain sockets use
+ # "http+unix://<urlquoted-path-to-socket>", e.g.
+ # "http+unix://%2Fpath%2Fto%2Fsocket"
+-gitlab_url: "http://localhost:8080"
++gitlab_url: "http+unix://%2Frun%2Fgitlab%2Fgitlab.socket"
+ 
+ # See installation.md#using-https for additional HTTPS configuration details.
+ http_settings:
+@@ -25,15 +25,15 @@ http_settings:
+   self_signed_cert: false
+ 
+ # File used as authorized_keys for gitlab user
+-auth_file: "/home/git/.ssh/authorized_keys"
++auth_file: "/var/lib/gitlab/.ssh/authorized_keys"
+ 
+ # File that contains the secret key for verifying access to GitLab.
+ # Default is .gitlab_shell_secret in the gitlab-shell directory.
+-# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret"
++secret_file: "/var/lib/gitlab/gitlab-shell/.gitlab_shell_secret"
+ 
+ # Log file.
+ # Default is gitlab-shell.log in the root directory.
+-# log_file: "/home/git/gitlab-shell/gitlab-shell.log"
++log_file: "/var/log/gitlab/gitlab-shell.log"
+ 
+ # Log level. INFO by default
+ log_level: INFO

Copied: gitlab-shell/repos/community-testing-x86_64/gitlab-shell.gitconfig (from rev 635011, gitlab-shell/trunk/gitlab-shell.gitconfig)
===================================================================
--- community-testing-x86_64/gitlab-shell.gitconfig	                        (rev 0)
+++ community-testing-x86_64/gitlab-shell.gitconfig	2020-05-26 08:33:27 UTC (rev 635012)
@@ -0,0 +1,5 @@
+[user]
+    name = GitLab
+    email = gitlab at localhost
+[core]
+    autocrlf = input

Copied: gitlab-shell/repos/community-testing-x86_64/gitlab-shell.install (from rev 635011, gitlab-shell/trunk/gitlab-shell.install)
===================================================================
--- community-testing-x86_64/gitlab-shell.install	                        (rev 0)
+++ community-testing-x86_64/gitlab-shell.install	2020-05-26 08:33:27 UTC (rev 635012)
@@ -0,0 +1,9 @@
+post_install() {
+    echo "Configure gitlab-shell in /etc/webapps/gitlab-shell/config.yml"
+    echo "Put a secret bytestring to /etc/webapps/gitlab-shell/secret"
+}
+
+post_upgrade() {
+    echo "If you have previously installed gitlab-shell and now git pull fails on a repo, try changing the shell:"
+    echo "usermod -s /usr/share/webapps/gitlab-shell/bin/gitlab-shell gitlab"
+}

Copied: gitlab-shell/repos/community-testing-x86_64/gitlab-shell.sysusers (from rev 635011, gitlab-shell/trunk/gitlab-shell.sysusers)
===================================================================
--- community-testing-x86_64/gitlab-shell.sysusers	                        (rev 0)
+++ community-testing-x86_64/gitlab-shell.sysusers	2020-05-26 08:33:27 UTC (rev 635012)
@@ -0,0 +1 @@
+u gitlab 105 - /var/lib/gitlab /usr/share/webapps/gitlab-shell/bin/gitlab-shell


More information about the arch-commits mailing list