diff --git a/debian/changelog b/debian/changelog index 1aa60a8007..451c0a4c10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +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 + + -- Pirate Praveen Tue, 07 Mar 2023 21:36:21 +0530 + gitlab (15.7.8+ds1-4~fto11+1) bullseye-fasttrack; urgency=medium * Rebuild for bullseye-fasttrack. 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: