diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-11 15:39:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 15:39:38 +0100 |
| commit | cbcbfe64a2b306f0eaff74d4ceb7f2550d8b4b6a (patch) | |
| tree | 8465e03c3d60c0d76aa8c77e2eb4ecd9f503a6b8 /docs | |
| parent | Clean up some code in the retry logic (#6017) (diff) | |
| parent | Update sample config (diff) | |
| download | synapse-cbcbfe64a2b306f0eaff74d4ceb7f2550d8b4b6a.tar.xz | |
Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction
Allow use of different ratelimits for admin redactions.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 9b1ae58a27..c970a1c679 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -518,6 +518,9 @@ log_config: "CONFDIR/SERVERNAME.log.config" # - one for login that ratelimits login requests based on the account the # client is attempting to log into, based on the amount of failed login # attempts for this account. +# - one for ratelimiting redactions by room admins. If this is not explicitly +# set then it uses the same ratelimiting as per rc_message. This is useful +# to allow room admins to deal with abuse quickly. # # The defaults are as shown below. # @@ -539,6 +542,10 @@ log_config: "CONFDIR/SERVERNAME.log.config" # failed_attempts: # per_second: 0.17 # burst_count: 3 +# +#rc_admin_redaction: +# per_second: 1 +# burst_count: 50 # Ratelimiting settings for incoming federation |