[arch-commits] Commit in gitlab/trunk (8 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sun Dec 23 00:50:29 UTC 2018
Date: Sunday, December 23, 2018 @ 00:50:28
Author: svenstaro
Revision: 417582
upgpkg: gitlab 11.6.0-2
Fix some more occurrences to use ruby instead of ruby2.3
Modified:
gitlab/trunk/PKGBUILD
gitlab/trunk/gitlab-backup.service
gitlab/trunk/gitlab-mailroom.service
gitlab/trunk/gitlab-sidekiq.service
gitlab/trunk/gitlab-unicorn.service
gitlab/trunk/gitlab.install
Deleted:
gitlab/trunk/a951b96be2862ce660dc715a364f574c2f5f72e1.patch
gitlab/trunk/lighttpd.conf.example
------------------------------------------------+
PKGBUILD | 10 +++---
a951b96be2862ce660dc715a364f574c2f5f72e1.patch | 28 ------------------
gitlab-backup.service | 4 +-
gitlab-mailroom.service | 4 +-
gitlab-sidekiq.service | 6 +--
gitlab-unicorn.service | 4 +-
gitlab.install | 8 ++---
lighttpd.conf.example | 35 -----------------------
8 files changed, 18 insertions(+), 81 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-23 00:35:08 UTC (rev 417581)
+++ PKGBUILD 2018-12-23 00:50:28 UTC (rev 417582)
@@ -11,7 +11,7 @@
# need this again at some point in the future.
pkgname=gitlab
pkgver=11.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="Project management and code hosting application"
arch=('x86_64')
url="https://gitlab.com/gitlab-org/gitlab-ce"
@@ -39,10 +39,10 @@
gitlab.logrotate)
install='gitlab.install'
sha512sums=('450d16183f945245e44e4869ad1056f9d2efc1fc54cf9200b5cf9a956936347c6ef6d7cdd2c7a47c3b6d03b53f66e30f6d6ead9423c1547b43f13876b663119e'
- 'b1bc7c1f3d47758e4745ae3689e61989c6d1fd8490fa60d75de60d3960025f2888da5c50c4a70e1656d75e4d53bcece518e87f743855eed150a61cb11d40b7d2'
- 'ea5ae64214a82b522a09c20be2967ae2ff6fbfd7683587909b748dab4647f99b3128c0e16aba375ecb191e47e1b9045587a84322e216e5cda940904c4fa6271c'
- '69e6f43008389fb54bba6cea61adb0dbf5b75c5796f5cca327326f20f329365c003847bbd6d53b113a0afb1a0d3a0b101a92476739daf85f65c670a1d4466f9c'
- '57b562675dbcb35ced9af0fc8ed8f1fe4479f87a460fe7418475a2d9d58d9d200a9071265a15bc1cea374340c63183bc79f828b2f48160dfb4d689a9db952dc9'
+ 'b4cb93962f46f2aedb891be06e052db8d9651992636ce9c0807ad437e9040062fde1a3ff3e91a055b936752c622e0c1762bd2d7d512040c6136928dabf884888'
+ 'd2de30f346677ed9387303a7890c8b47aef167325c10314dc4f34fb595265b8a43c311329a8977ab606894561a0f672d23acdbaec628b887f19f3f73d9f385d0'
+ '8d2ca0abb3cc14f02b7e9582cc4628f3443f93f32a005d2c7a3f82b6726d31a1b43e06c1a957e29bd1bdcead596f9194427afc5671a6d1ae44b208ad5a24fb1f'
+ '41f6bf17251fb77105d62c1a5199719414ea2bfe7743d5557138347329e1fd137eeeb22f43f3e77b3058d5ae23639cc9f0ccb41dce3b1a507211e0f3a2b3229b'
'c11d2c59da8325551a465227096e8d39b0e4bcd5b1db21565cf3439e431838c04bc00aa6f07f4d493f3f47fd6b4e25aeb0fe0fc1a05756064706bf5708c960ec'
'bf33b818e4ea671c16f58563997ba5fe0a09090e5c03577ff974d31324d4e9782b85a9bb4f1749b97257ce93400c692de935f003770d52b5994c9cab9aee57c6'
'abacbff0d7be918337a17b56481c84e6bf3eddd9551efe78ba9fb74337179e95c9b60f41c49f275e05074a4074a616be36fa208a48fc12d5b940f0554fbd89c3'
Deleted: a951b96be2862ce660dc715a364f574c2f5f72e1.patch
===================================================================
--- a951b96be2862ce660dc715a364f574c2f5f72e1.patch 2018-12-23 00:35:08 UTC (rev 417581)
+++ a951b96be2862ce660dc715a364f574c2f5f72e1.patch 2018-12-23 00:50:28 UTC (rev 417582)
@@ -1,28 +0,0 @@
-From a951b96be2862ce660dc715a364f574c2f5f72e1 Mon Sep 17 00:00:00 2001
-From: Zeger-Jan van de Weg <git at zjvandeweg.nl>
-Date: Fri, 30 Mar 2018 12:32:26 +0200
-Subject: [PATCH] Update charlock_holmes to 0.76
-
-Didn't compile against newer icu4c versions and was fixed upstream in
-https://github.com/brianmario/charlock_holmes/pull/129, which was
-releaed in the versions its now locked to.
----
- Gemfile.lock | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Gemfile.lock b/Gemfile.lock
-index fcffe45..5271d65 100644
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -120,7 +120,7 @@ GEM
- activesupport (>= 4.0.0)
- mime-types (>= 1.16)
- cause (0.1)
-- charlock_holmes (0.7.5)
-+ charlock_holmes (0.7.6)
- childprocess (0.7.0)
- ffi (~> 1.0, >= 1.0.11)
- chronic (0.10.2)
---
-libgit2 0.26.0
-
Modified: gitlab-backup.service
===================================================================
--- gitlab-backup.service 2018-12-23 00:35:08 UTC (rev 417581)
+++ gitlab-backup.service 2018-12-23 00:50:28 UTC (rev 417582)
@@ -10,7 +10,7 @@
SyslogIdentifier=gitlab-backup
WorkingDirectory=<DATADIR>
# Prevent ExecJS from complaining that Node is not installed in production
-Environment=RAILS_ENV=production PATH=/opt/ruby2.3/bin:/usr/bin EXECJS_RUNTIME=Disabled
+Environment=RAILS_ENV=production PATH=/opt/ruby/bin:/usr/bin EXECJS_RUNTIME=Disabled
CapabilityBoundingSet=
PrivateTmp=true
PrivateDevices=true
@@ -17,4 +17,4 @@
ProtectSystem=full
ProtectHome=true
NoNewPrivileges=true
-ExecStart=/usr/bin/bundle-2.3 exec rake gitlab:backup:create
+ExecStart=/usr/bin/bundle exec rake gitlab:backup:create
Modified: gitlab-mailroom.service
===================================================================
--- gitlab-mailroom.service 2018-12-23 00:35:08 UTC (rev 417581)
+++ gitlab-mailroom.service 2018-12-23 00:50:28 UTC (rev 417582)
@@ -10,10 +10,10 @@
Group=gitlab
WorkingDirectory=<DATADIR>
# Prevent ExecJS from complaining that Node is not installed in production
-Environment=RAILS_ENV=production PATH=/opt/ruby2.3/bin:/usr/bin EXECJS_RUNTIME=Disabled
+Environment=RAILS_ENV=production PATH=/opt/ruby/bin:/usr/bin EXECJS_RUNTIME=Disabled
SyslogIdentifier=gitlab-mailroom
PIDFile=/run/gitlab/mailroom.pid
-ExecStart=/usr/bin/bundle-2.3 exec mail_room -q -c <DATADIR>/config/mail_room.yml
+ExecStart=/usr/bin/bundle exec mail_room -q -c <DATADIR>/config/mail_room.yml
ExecStop=/usr/bin/kill -QUIT $MAINPID
Restart=on-failure
RestartSec=1
Modified: gitlab-sidekiq.service
===================================================================
--- gitlab-sidekiq.service 2018-12-23 00:35:08 UTC (rev 417581)
+++ gitlab-sidekiq.service 2018-12-23 00:50:28 UTC (rev 417582)
@@ -11,7 +11,7 @@
Group=gitlab
WorkingDirectory=<DATADIR>
# Prevent ExecJS from complaining that Node is not installed in production
-Environment=RAILS_ENV=production PATH=/opt/ruby2.3/bin:/usr/bin EXECJS_RUNTIME=Disabled
+Environment=RAILS_ENV=production PATH=/opt/ruby/bin:/usr/bin EXECJS_RUNTIME=Disabled
SyslogIdentifier=gitlab-sidekiq
PIDFile=/run/gitlab/sidekiq.pid
PrivateTmp=true
@@ -22,8 +22,8 @@
# instead you can safely enable these security features.
#NoNewPrivileges=true
#CapabilityBoundingSet=
-ExecStart=/usr/bin/bundle-2.3 exec sidekiq -C <DATADIR>/config/sidekiq_queues.yml -e production
-ExecStop=/usr/bin/bundle-2.3 exec sidekiqctl stop /run/gitlab/sidekiq.pid
+ExecStart=/usr/bin/bundle exec sidekiq -C <DATADIR>/config/sidekiq_queues.yml -e production
+ExecStop=/usr/bin/bundle exec sidekiqctl stop /run/gitlab/sidekiq.pid
Restart=on-failure
RestartSec=1
Modified: gitlab-unicorn.service
===================================================================
--- gitlab-unicorn.service 2018-12-23 00:35:08 UTC (rev 417581)
+++ gitlab-unicorn.service 2018-12-23 00:50:28 UTC (rev 417582)
@@ -10,7 +10,7 @@
Group=gitlab
WorkingDirectory=<DATADIR>
# Prevent ExecJS from complaining that Node is not installed in production
-Environment=RAILS_ENV=production PATH=/opt/ruby2.3/bin:/usr/bin EXECJS_RUNTIME=Disabled
+Environment=RAILS_ENV=production PATH=/opt/ruby/bin:/usr/bin EXECJS_RUNTIME=Disabled
SyslogIdentifier=gitlab-unicorn
PIDFile=/run/gitlab/unicorn.pid
RuntimeDirectory=gitlab
@@ -24,7 +24,7 @@
# instead you can safely enable these security features.
#NoNewPrivileges=true
#CapabilityBoundingSet=
-ExecStart=/usr/bin/bundle-2.3 exec unicorn_rails -c <DATADIR>/config/unicorn.rb -E production
+ExecStart=/usr/bin/bundle exec unicorn_rails -c <DATADIR>/config/unicorn.rb -E production
ExecStop=/usr/bin/kill -QUIT $MAINPID
ExecReload=/usr/bin/kill -USR2 $MAINPID
Restart=on-failure
Modified: gitlab.install
===================================================================
--- gitlab.install 2018-12-23 00:35:08 UTC (rev 417581)
+++ gitlab.install 2018-12-23 00:50:28 UTC (rev 417582)
@@ -5,15 +5,15 @@
echo "Copy /usr/share/doc/gitlab/secrets.yml.example to /etc/webapps/gitlab/secrets.yml and configure it"
echo "Copy a database example config from /usr/share/doc/gitlab/ to /etc/webapps/gitlab/database.yml and configure it"
echo "Setup the database:"
- echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; EXECJS_RUNTIME=Disabled bundle-2.3 exec rake gitlab:setup RAILS_ENV=production\""
+ echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; EXECJS_RUNTIME=Disabled bundle exec rake gitlab:setup RAILS_ENV=production\""
echo "Finally run the following commands to check your installation:"
- echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; EXECJS_RUNTIME=Disabled bundle-2.3 exec rake gitlab:env:info RAILS_ENV=production\""
- echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; EXECJS_RUNTIME=Disabled bundle-2.3 exec rake gitlab:check RAILS_ENV=production\""
+ echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; EXECJS_RUNTIME=Disabled bundle exec rake gitlab:env:info RAILS_ENV=production\""
+ echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; EXECJS_RUNTIME=Disabled bundle exec rake gitlab:check RAILS_ENV=production\""
}
post_upgrade() {
echo "You should upgrade your database:"
- echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; EXECJS_RUNTIME=Disabled bundle-2.3 exec rake db:migrate RAILS_ENV=production\""
+ echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; EXECJS_RUNTIME=Disabled 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 gitlab-gitaly"
Deleted: lighttpd.conf.example
===================================================================
--- lighttpd.conf.example 2018-12-23 00:35:08 UTC (rev 417581)
+++ lighttpd.conf.example 2018-12-23 00:50:28 UTC (rev 417582)
@@ -1,35 +0,0 @@
-# GITLAB
-# Maintainer: @tvn87
-# App Version: 2.8
-
-server.modules += (
- "mod_simple_vhost",
- "mod_proxy"
-)
-
-## The document root of a virtual host is document-root =
-## simple-vhost.server-root + $HTTP["host"] + simple-vhost.document-root
-simple-vhost.server-root = "/var/www"
-simple-vhost.document-root = "htdocs"
-
-## the default host if no host is sent
-simple-vhost.default-host = "YOUR_SERVER_FQDN"
-
-## uploads must be served as static files
-$HTTP["url"] == "^/upload" {
- var.vhost.name = "YOUR_SERVER_FQDN"
- var.vhost.path = "/usr/share/webapps/gitlab/public"
-}
-## otherwise everything is proxied
-else $HTTP["host"] == "YOUR_SERVER_FQDN" {
- var.vhost_name = "YOUR_SERVER_FQDN"
- var.vhost_path = "/var/www/YOUR_SERVER_FQDN" # This directory should be empty
-
- proxy.server = ( "" => ( (
- "host" => "127.0.0.1",
- "port" => "8080"
- ),
- )
- )
- ssl.pemfile = "/etc/lighttpd/certs/YOUR_SERVER_FQDN.pem" # If ssl is enabled
-}
More information about the arch-commits
mailing list