diff --git a/changelogs/unreleased/816-mailroom-fix-redis-no-password.yml b/changelogs/unreleased/816-mailroom-fix-redis-no-password.yml new file mode 100644 index 0000000000000000000000000000000000000000..3f45b8d98a04adbfb5807ff143a60215bc840b2a --- /dev/null +++ b/changelogs/unreleased/816-mailroom-fix-redis-no-password.yml @@ -0,0 +1,5 @@ +--- +title: 'Mailroom: fix redis without passsword' +merge_request: 816 +author: arthur13 +type: fixed \ No newline at end of file diff --git a/charts/gitlab/charts/mailroom/templates/configmap.yaml b/charts/gitlab/charts/mailroom/templates/configmap.yaml index ec48f7245d9aeea7cf65392527fc38346f935c0e..97dba582f73eeb3221d6a803c4ded0578f694a90 100644 --- a/charts/gitlab/charts/mailroom/templates/configmap.yaml +++ b/charts/gitlab/charts/mailroom/templates/configmap.yaml @@ -23,7 +23,7 @@ data: :delivery_method: sidekiq {{- end }} :delivery_options: - :redis_url: {{ template "gitlab.redis.scheme" . }}://:<%= File.read("/etc/gitlab/redis/password") %>@{{ template "gitlab.redis.host" . }}:{{ template "gitlab.redis.port" . }} + :redis_url: {{ template "gitlab.redis.url" . }} :namespace: resque:gitlab :queue: email_receiver :worker: EmailReceiverWorker