[discourse-web/flathub] Pull CERN changes

[Bartłomiej Piotrowski <bpiotrowski src gnome org>]

commit 481925946721ad1671a7ba75877ae2d8702b6a91
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Mon Nov 2 09:34:10 2020 +0100

    Pull CERN changes

 Dockerfile            |  2 +-
 config/discourse.conf | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/Dockerfile b/Dockerfile
index eeab1b8..4a6280f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Check https://github.com/discourse/discourse_docker/blob/master/launcher
-FROM discourse/base:2.0.20200724-1815
+FROM discourse/base:2.0.20201004-2310
 
 LABEL maintainer="Discourse Administrators <discourse-admins cern ch>" \
       io.openshift.expose-services="8080,3000,6379:http"
diff --git a/config/discourse.conf b/config/discourse.conf
index 232d53f..05ea997 100644
--- a/config/discourse.conf
+++ b/config/discourse.conf
@@ -207,6 +207,18 @@ force_anonymous_min_queue_seconds = 1
 # only trigger anon if we see more than N requests for this path in last 10 seconds
 force_anonymous_min_per_10_seconds = 3
 
+# Any requests with the headers Discourse-Background = true will not be allowed to queue
+# longer than this amount of time.
+# Discourse will rate limit and ask client to try again later.
+background_requests_max_queue_length = 0.5
+
+# if a message bus request queues for 100ms or longer, we will reject it and ask consumer
+# to back off
+reject_message_bus_queue_seconds = 0.1
+
+# disable search if app server is queueing for longer than this (in seconds)
+disable_search_queue_threshold = 1
+
 # maximum number of posts rebaked across the cluster in the periodical job
 # rebake process is very expensive, on multisite we have to make sure we never
 # flood the queue
@@ -278,6 +290,11 @@ allowed_theme_repos =
 # need to be (e.g. development, test, certain hosting tiers)
 enable_email_sync_demon = false
 
+# we never want to queue more than 10000 digests per 30 minute block
+# this can easily lead to blocking sidekiq
+# on multisites we recommend a far lower number
+max_digests_enqueued_per_30_mins_per_site = 10000
+
 # Set trusted ip's for prometheus.
 # Check standard nodes ips.
 prometheus_trusted_ip_allowlist_regex = '(::ffff:188\.18[4-5])|(::ffff:137\.138)'