community/gitlab to 9.3.2-4

community/gitlab/PKGBUILD

@@ -12,12 +12,12 @@
 
 pkgname=gitlab
 pkgver=9.3.2
-pkgrel=2
+pkgrel=4
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-ce/tree/master#README"
 license=('MIT')
-depends=('ruby2.3' 'git' 'ruby2.3-bundler' 'gitlab-workhorse' 'openssh' 'redis' 'libxslt' 'icu' 'nodejs')
+depends=('ruby2.3' 'git' 'ruby2.3-bundler' 'gitlab-workhorse' 'gitlab-gitaly' 'openssh' 'redis' 'libxslt' 'icu' 'nodejs')
 makedepends=('cmake' 'postgresql' 'mariadb' 'yarn' 'go')
 optdepends=('postgresql: database backend'
             'mysql: database backend'
@@ -81,7 +81,7 @@ prepare() {
       -e "s|# path: /mnt/gitlab|path: ${_homedir}/shared|" \
       -e "s|/home/git/gitlab-shell|/usr/share/webapps/gitlab-shell|" \
       -e "s|tmp/backups|${_homedir}/backups|" \
-      -e "s|/home/git/gitlab/tmp/sockets/private|${_homedir}/sockets|" \
+      -e "s|/home/git/gitlab/tmp/sockets/private/gitaly.socket|${_homedir}/sockets/gitlab-gitaly.socket|" \
       config/gitlab.yml.example > config/gitlab.yml
 
   msg2 "Patching paths and timeout in unicorn.rb..."
@@ -126,9 +126,6 @@ build() {
   cp config/resque.yml.example config/resque.yml
   sed -i 's/url.*/nope.sock/g' config/resque.yml
 
-  bundle-2.3 exec rake "gitlab:gitaly:install[/tmp/gitaly]" RAILS_ENV=production
-  rm -rf /tmp/gitaly/_build
-
   bundle-2.3 exec rake assets:precompile RAILS_ENV=production --trace
 
 #  yarn install --production --pure-lockfile
@@ -147,7 +144,6 @@ package() {
   install -d "${pkgdir}/usr/share/webapps"
 
   cp -r "${srcdir}/${_srcdir}"* "${pkgdir}${_datadir}"
-  cp -r /tmp/gitaly "${pkgdir}${_datadir}"/../gitaly  # This was prepared in build()
   chown -R root:root "${pkgdir}${_datadir}"
   chmod 755 "${pkgdir}${_datadir}"
 

community/gitlab/gitlab.install

@@ -16,5 +16,5 @@ post_upgrade() {
     echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; bundle exec rake db:migrate RAILS_ENV=production\""
     echo "Afterwards, restart gitlab-related services:"
     echo "# systemctl daemon-reload"
-    echo "# systemctl restart gitlab-sidekiq gitlab-unicorn gitlab-workhorse"
+    echo "# systemctl restart gitlab-sidekiq gitlab-unicorn gitlab-workhorse gitlab-gitaly"
 }