diff --git a/community/gitlab/PKGBUILD b/community/gitlab/PKGBUILD index 487249296..03fb2d428 100644 --- a/community/gitlab/PKGBUILD +++ b/community/gitlab/PKGBUILD @@ -11,7 +11,7 @@ pkgname=gitlab pkgver=8.15.4 -pkgrel=1 +pkgrel=2 pkgdesc="Project management and code hosting application" arch=('i686' 'x86_64') url="https://gitlab.com/gitlab-org/gitlab-ce/tree/master#README" @@ -45,10 +45,10 @@ source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/gitlab-org/gitlab-ce/reposi lighttpd.conf.example) install='gitlab.install' sha512sums=('485907942cc84603886985c2fddbccf11d0b01ba8491af225387fb6e58629766177b59cd923df76c91e4d5dd4cc345deb5ce87f7012789f2f6c5fbef7fe5dfe5' - '1464ca9399b627bb8bd286608b4ad93feca6bc54c7e63c98180744e710295508a89a1a34c412b82e3eaad9308a82b2ea2483ae0f0b1e1149c24b17ab0d126f69' - '9844b8e42e8d50e6eac54711fb8c9745d506560676e0b8d5f1c42fb5177b9b4bac5c0d3c6a673d9e54f4b5e21056627db1d434c5c76d4f3ede8cc15a109f3cb6' - 'e74f54224e7fd5f24c3459f34649ce5fddc70886faf7eb8520513d8715b3c17452aab62676b779c136ba576193a09ae3a5471abe51013d7ecd8b37d6e0acd393' - '97b566751405ad46204f9d42e835a20aa330436929674913acfb35a2a1fdce06975f15db4f83708ec5d1ab4509b6d34f1bc23e43f0db1bf28073c4bd865cb007' + '56cce150645ef74fa42a6100c8bc7689c4012579e1f3ba237c06c367b121246b39e968044615fa21c4757bc8e9d06f37f8ac8d39aa8b808c758e716857553f66' + '52651e4a5dd2d632e31b7275283f9b8ab2c32c4d56b63d17bd843f300e273e382e339e5aed66222b1b2279273357cbb73aa38119f04784fe380d1550346f1ff3' + '79cfb8ee740ab30f970c3113659b8349128abeae5e32cc81bb905f89a6db9941b7778040a094b884262daf020f66a1aee49a12d34fbb94efce6ade946bb4625b' + 'c097a26d1c24f120967ae457f9008df06af0cd2662306410d8e3f6cc4b5772416125fcd3c895bc35872251060083e8c95b37455b8d20154518d8c467625291eb' 'c11d2c59da8325551a465227096e8d39b0e4bcd5b1db21565cf3439e431838c04bc00aa6f07f4d493f3f47fd6b4e25aeb0fe0fc1a05756064706bf5708c960ec' 'c519a51d31300074ea12594fbcc8e9610d991ef04b1dac94d93a2b201df3465999cc7c6ac7f3896e02b117c2366d61dea1ef2f6b9cd7b18998385a7f26e5700f' 'abacbff0d7be918337a17b56481c84e6bf3eddd9551efe78ba9fb74337179e95c9b60f41c49f275e05074a4074a616be36fa208a48fc12d5b940f0554fbd89c3' diff --git a/community/gitlab/gitlab-backup.service b/community/gitlab/gitlab-backup.service index 603be0971..0c804dd59 100644 --- a/community/gitlab/gitlab-backup.service +++ b/community/gitlab/gitlab-backup.service @@ -16,4 +16,4 @@ PrivateDevices=true ProtectSystem=full ProtectHome=true NoNewPrivileges=true -ExecStart=/usr/bin/bundle exec rake gitlab:backup:create +ExecStart=/usr/bin/bundle-2.3 exec rake gitlab:backup:create diff --git a/community/gitlab/gitlab-mailroom.service b/community/gitlab/gitlab-mailroom.service index 18b7e1eb4..8f80fb6ca 100644 --- a/community/gitlab/gitlab-mailroom.service +++ b/community/gitlab/gitlab-mailroom.service @@ -11,7 +11,7 @@ WorkingDirectory= Environment=RAILS_ENV=production PATH=/opt/ruby/bin:/usr/bin SyslogIdentifier=gitlab-mailroom PIDFile=/run/gitlab/mailroom.pid -ExecStart=/usr/bin/bundle exec mail_room -q -c /config/mail_room.yml +ExecStart=/usr/bin/bundle-2.3 exec mail_room -q -c /config/mail_room.yml ExecStop=/usr/bin/kill -QUIT $MAINPID Restart=on-failure RestartSec=1 diff --git a/community/gitlab/gitlab-sidekiq.service b/community/gitlab/gitlab-sidekiq.service index 8a14de99c..c32000ac4 100644 --- a/community/gitlab/gitlab-sidekiq.service +++ b/community/gitlab/gitlab-sidekiq.service @@ -21,8 +21,8 @@ ProtectHome=true # use postfix' sendmail wrapper. If you use an SMTP server # instead you can safely enable this security feature. #NoNewPrivileges=true -ExecStart=/usr/bin/bundle exec sidekiq -C /config/sidekiq_queues.yml -e production -ExecStop=/usr/bin/bundle exec sidekiqctl stop /run/gitlab/sidekiq.pid +ExecStart=/usr/bin/bundle-2.3 exec sidekiq -C /config/sidekiq_queues.yml -e production +ExecStop=/usr/bin/bundle-2.3 exec sidekiqctl stop /run/gitlab/sidekiq.pid Restart=on-failure RestartSec=1 diff --git a/community/gitlab/gitlab-unicorn.service b/community/gitlab/gitlab-unicorn.service index dcbbb265f..47d064de8 100644 --- a/community/gitlab/gitlab-unicorn.service +++ b/community/gitlab/gitlab-unicorn.service @@ -19,7 +19,7 @@ PrivateDevices=true ProtectSystem=full ProtectHome=true NoNewPrivileges=true -ExecStart=/usr/bin/bundle exec unicorn_rails -c /config/unicorn.rb -E production +ExecStart=/usr/bin/bundle-2.3 exec unicorn_rails -c /config/unicorn.rb -E production ExecStop=/usr/bin/kill -QUIT $MAINPID ExecReload=/usr/bin/kill -USR2 $MAINPID Restart=on-failure