From 9eacaaceb4b9e5db208ff29bc0fc26e6e16e07f3 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 7 Mar 2023 21:08:13 +0530 Subject: [PATCH 1/4] Update minimum versions of ruby-gpgme and ruby-doorkeeper-openid-connect --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 433f6daa36..7dd575950f 100644 --- a/debian/control +++ b/debian/control @@ -120,7 +120,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-devise (>= 4.8.1~), ruby-bcrypt (>= 3.1.14~), ruby-doorkeeper (>= 5.5~), - ruby-doorkeeper-openid-connect (>= 1.7.5~), + ruby-doorkeeper-openid-connect (>= 1.8~), ruby-rexml (>= 3.2.3.1~), ruby-saml (>= 1.13~), ruby-omniauth (>= 2.1~), @@ -163,7 +163,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # OS detection for usage ping ohai (>= 16.13.0-2~), # GPG - ruby-gpgme (>= 2.0.19~), + ruby-gpgme (>= 2.0.22~), # LDAP Auth ruby-omniauth-ldap (>= 2.2~), ruby-ntlm (>= 0.6.1~), From f36950b341425a3c6fef86deb0b038b177b0aee2 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 7 Mar 2023 21:36:28 +0530 Subject: [PATCH 2/4] Upload to experimental --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 390f53417b..e9f65600b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gitlab (15.7.8+ds1-5) experimental; urgency=medium + + * Update minimum versions of ruby-gpgme and ruby-doorkeeper-openid-connect + + -- Pirate Praveen Tue, 07 Mar 2023 21:36:21 +0530 + gitlab (15.7.8+ds1-4) experimental; urgency=medium * Remove rubygems.org version of gitlab-labkit From 03530721b4cf2ecf67f8ef4f29f471cc753abb60 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 8 Mar 2023 18:50:47 +0530 Subject: [PATCH 3/4] Start a sidekiq cluster instead of standalone --- debian/gitlab.gitlab-sidekiq.service | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/gitlab.gitlab-sidekiq.service b/debian/gitlab.gitlab-sidekiq.service index f8b18a3010..6a6e51f06d 100644 --- a/debian/gitlab.gitlab-sidekiq.service +++ b/debian/gitlab.gitlab-sidekiq.service @@ -11,12 +11,11 @@ ReloadPropagatedFrom=gitlab.service Type=simple WorkingDirectory=/usr/share/gitlab EnvironmentFile=/etc/gitlab/gitlab-debian.conf +Environment=SIDEKIQ_QUEUES=* SyslogIdentifier=gitlab-sidekiq ExecStartPre=truncate -s 0 Gemfile.lock ExecStartPre=/usr/bin/bundle install --local --quiet -ExecStart=/usr/bin/bundle exec sidekiq \ - -C /etc/gitlab/sidekiq_queues.yml \ - -e $RAILS_ENV +ExecStart=/usr/bin/bundle exec bin/sidekiq-cluster $SIDEKIQ_QUEUES -e $RAILS_ENV Restart=on-abnormal ## No "Type=notify" support; wait for service to initialise: From 9d7691c9e269c4fbc996eacd62b6a8e57e70074a Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 8 Mar 2023 18:52:05 +0530 Subject: [PATCH 4/4] Upload to experimental --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index e9f65600b3..a34485a4ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (15.7.8+ds1-6) experimental; urgency=medium + + * Start a sidekiq cluster instead of standalone (upstream now only supports + a cluster and gitlab:check fails without it) (Thanks to vv221) + + -- Pirate Praveen Wed, 08 Mar 2023 18:51:15 +0530 + gitlab (15.7.8+ds1-5) experimental; urgency=medium * Update minimum versions of ruby-gpgme and ruby-doorkeeper-openid-connect