Commit 6a4e45c5 authored by Kirill Smelkov's avatar Kirill Smelkov

gitlab: Sync sidekiq service launch with upstream

Upstream added `pages` and `elasticsearch` queues to sidekiq

    https://gitlab.com/gitlab-org/omnibus-gitlab/commit/be6844ff
    https://gitlab.com/gitlab-org/omnibus-gitlab/commit/801d6ed7

but since those queues are used for EE-only services we do not enable
them.

/cc @kazuhiko, @jerome
parent 02beb91b
......@@ -622,7 +622,7 @@ log = ${sidekiq-dir:log}
# NOTE see queue list here:
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Procfile
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb
# (last updated for ominbus-gitlab 8.2.3+ce.0-0-g8eda093)
# (last updated for omnibus-gitlab 8.4.2+ce.0-3-g68d5ee8)
[service-sidekiq]
recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:service}/sidekiq
......@@ -635,6 +635,7 @@ command-line =
${gitlab-sidekiq:wrapper-path}
# XXX -q runner ? (present in gitlab-ce/Procfile but not in omnibus)
# XXX -q pages -q elasticsearch ? (present in omnibus but not in gitlab-ce -- those features are gitlab-ee only)
# XXX -P ? (pidfile)
-e production
-r ${gitlab-work:location}
......
......@@ -247,7 +247,7 @@ md5sum = 97b7f5654bc280542ee348cb6fa60893
[instance-gitlab.cfg.in]
<= download-file
md5sum = dd9dd3e5f7fc22f18f70ee905786c298
md5sum = 937640a46b8300edbc72901053e0392b
[macrolib.cfg.in]
<= download-file
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment