Date: Friday, April 13, 2018 @ 12:04:37 Author: svenstaro Revision: 316170
archrelease: copy trunk to community-x86_64 Added: gitlab-gitaly/repos/community-x86_64/PKGBUILD (from rev 316169, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-x86_64/gitlab-gitaly.service (from rev 316169, gitlab-gitaly/trunk/gitlab-gitaly.service) Deleted: gitlab-gitaly/repos/community-x86_64/PKGBUILD gitlab-gitaly/repos/community-x86_64/gitlab-gitaly.service -----------------------+ PKGBUILD | 122 ++++++++++++++++++++++++------------------------ gitlab-gitaly.service | 50 +++++++++---------- 2 files changed, 86 insertions(+), 86 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-13 12:04:30 UTC (rev 316169) +++ PKGBUILD 2018-04-13 12:04:37 UTC (rev 316170) @@ -1,61 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> - -pkgname=gitlab-gitaly -pkgver=0.95.0 -pkgrel=1 -pkgdesc="Speed up Git access using caching" -arch=('x86_64') -url="https://gitlab.com/gitlab-org/gitaly" -license=('MIT') -depends=(glibc ruby2.3 libxml2 libxslt) -options=(!buildflags) -makedepends=(go ruby2.3-bundler cmake) -backup=("etc/gitlab-gitaly/config.toml") -source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitaly/repository/archive.tar.gz?ref=v${pkgver}" - "gitlab-gitaly.service") -sha512sums=('71d1a55fb929956d6edc36b23fcfbc4904c482005772366545d6917219de60732f484b86c7bf54ba6a205d9e5b332677822eb9f765c3f7ac20003fd03c278381' - 'b330c0f42592322ad2131079ca554a13a364007182dded8c556198caff2c9ec642acf5bb7dfecb05de5a3d89bffec6588b6d05c8c7c5c771a46df3d296deed28') - -_homedir="/var/lib/gitlab" - -prepare() { - cd "gitaly-v${pkgver}-"* - - sed -i "s/bundle install/bundle-2.3 install/" Makefile - sed -i "s/bundle config/bundle-2.3 config/" Makefile - sed -i "s/bundle/bundle-2.3/" internal/rubyserver/rubyserver.go - sed -i "s/bundle/bundle-2.3/" internal/linguist/linguist.go - sed -i "s/\"ruby\"/\"ruby-2.3\"/" internal/linguist/linguist.go - sed -i "s/VERSION = .*/VERSION = ${pkgver}/" Makefile - sed -i "s/env ruby/env ruby-2.3/" ruby/bin/gitaly-ruby - sed -i "s/env ruby/env ruby-2.3/" ruby/bin/ruby-cd - 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 -} - -build() { - cd "gitaly-v${pkgver}-"* - - make build -} - -package() { - cd "gitaly-v${pkgver}-"* - - 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}/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 "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: Copied: gitlab-gitaly/repos/community-x86_64/PKGBUILD (from rev 316169, gitlab-gitaly/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-13 12:04:37 UTC (rev 316170) @@ -0,0 +1,61 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> + +pkgname=gitlab-gitaly +pkgver=0.96.1 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly" +license=('MIT') +depends=(glibc ruby2.3 libxml2 libxslt) +options=(!buildflags) +makedepends=(go ruby2.3-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitaly/repository/archive.tar.gz?ref=v${pkgver}" + "gitlab-gitaly.service") +sha512sums=('ca596a943bf11582904d033fe776c12275fc5b0feef3364b950e7d5d1105f4b72a4e3021cb669949c616ed52fe77f64dc971ba87f7c3390df3c1fd6848565dc7' + 'b330c0f42592322ad2131079ca554a13a364007182dded8c556198caff2c9ec642acf5bb7dfecb05de5a3d89bffec6588b6d05c8c7c5c771a46df3d296deed28') + +_homedir="/var/lib/gitlab" + +prepare() { + cd "gitaly-v${pkgver}-"* + + sed -i "s/bundle install/bundle-2.3 install/" Makefile + sed -i "s/bundle config/bundle-2.3 config/" Makefile + sed -i "s/bundle/bundle-2.3/" internal/rubyserver/rubyserver.go + sed -i "s/bundle/bundle-2.3/" internal/linguist/linguist.go + sed -i "s/\"ruby\"/\"ruby-2.3\"/" internal/linguist/linguist.go + sed -i "s/VERSION = .*/VERSION = ${pkgver}/" Makefile + sed -i "s/env ruby/env ruby-2.3/" ruby/bin/gitaly-ruby + sed -i "s/env ruby/env ruby-2.3/" ruby/bin/ruby-cd + 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 +} + +build() { + cd "gitaly-v${pkgver}-"* + + make build +} + +package() { + cd "gitaly-v${pkgver}-"* + + 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}/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 "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: Deleted: gitlab-gitaly.service =================================================================== --- gitlab-gitaly.service 2018-04-13 12:04:30 UTC (rev 316169) +++ gitlab-gitaly.service 2018-04-13 12:04:37 UTC (rev 316170) @@ -1,25 +0,0 @@ -##################################################### -# -# GitLab version : 9.x -# Contributors : axil -# Downloaded from : https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/init/systemd -# -#################################################### - -[Unit] -Description=Gitaly is a Git RPC service for handling all the git calls made by GitLab. -Requires=gitlab-unicorn.service -Wants=gitlab-unicorn.service -After=gitlab-unicorn.service - -[Service] -Type=simple -User=gitlab -Group=gitlab -WorkingDirectory=/usr/share/webapps/gitlab -SyslogIdentifier=gitlab-gitaly -PIDFile=/run/gitlab/gitaly.pid -ExecStart=/usr/bin/gitaly /etc/gitlab-gitaly/config.toml - -[Install] -WantedBy=multi-user.target Copied: gitlab-gitaly/repos/community-x86_64/gitlab-gitaly.service (from rev 316169, gitlab-gitaly/trunk/gitlab-gitaly.service) =================================================================== --- gitlab-gitaly.service (rev 0) +++ gitlab-gitaly.service 2018-04-13 12:04:37 UTC (rev 316170) @@ -0,0 +1,25 @@ +##################################################### +# +# GitLab version : 9.x +# Contributors : axil +# Downloaded from : https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/init/systemd +# +#################################################### + +[Unit] +Description=Gitaly is a Git RPC service for handling all the git calls made by GitLab. +Requires=gitlab-unicorn.service +Wants=gitlab-unicorn.service +After=gitlab-unicorn.service + +[Service] +Type=simple +User=gitlab +Group=gitlab +WorkingDirectory=/usr/share/webapps/gitlab +SyslogIdentifier=gitlab-gitaly +PIDFile=/run/gitlab/gitaly.pid +ExecStart=/usr/bin/gitaly /etc/gitlab-gitaly/config.toml + +[Install] +WantedBy=multi-user.target