From e6862512dc0d78dc069e8799c06b47024ed167d3 Mon Sep 17 00:00:00 2001 From: erikjohnston Date: Tue, 22 Feb 2022 12:26:55 +0000 Subject: deploy: 07f82ac29be42098ab5b135cb173437f9cd7c754 --- .../admin_api/background_updates.html | 2 +- .../usage/administration/admin_api/federation.html | 2 +- latest/usage/administration/admin_api/index.html | 2 +- .../admin_api/registration_tokens.html | 2 +- latest/usage/administration/admin_faq.html | 2 +- .../administration/database_maintenance_tools.html | 2 +- latest/usage/administration/index.html | 2 +- latest/usage/administration/request_log.html | 2 +- latest/usage/administration/state_groups.html | 2 +- ...derstanding_synapse_through_grafana_graphs.html | 2 +- .../administration/useful_sql_for_admins.html | 2 +- .../configuration/homeserver_sample_config.html | 22 +++++++++++++++++----- latest/usage/configuration/index.html | 2 +- .../usage/configuration/logging_sample_config.html | 2 +- .../configuration/user_authentication/index.html | 2 +- .../user_authentication/refresh_tokens.html | 2 +- .../user_authentication/single_sign_on/cas.html | 2 +- .../user_authentication/single_sign_on/index.html | 2 +- .../user_authentication/single_sign_on/saml.html | 2 +- 19 files changed, 35 insertions(+), 23 deletions(-) (limited to 'latest/usage') diff --git a/latest/usage/administration/admin_api/background_updates.html b/latest/usage/administration/admin_api/background_updates.html index 95e15f2e3c..54caa9d98f 100644 --- a/latest/usage/administration/admin_api/background_updates.html +++ b/latest/usage/administration/admin_api/background_updates.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/admin_api/federation.html b/latest/usage/administration/admin_api/federation.html index db48793600..8145fc652f 100644 --- a/latest/usage/administration/admin_api/federation.html +++ b/latest/usage/administration/admin_api/federation.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/admin_api/index.html b/latest/usage/administration/admin_api/index.html index 3cfbebb4bc..aa87ac5b3b 100644 --- a/latest/usage/administration/admin_api/index.html +++ b/latest/usage/administration/admin_api/index.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/admin_api/registration_tokens.html b/latest/usage/administration/admin_api/registration_tokens.html index 7f1f755392..d8218fc55a 100644 --- a/latest/usage/administration/admin_api/registration_tokens.html +++ b/latest/usage/administration/admin_api/registration_tokens.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/admin_faq.html b/latest/usage/administration/admin_faq.html index 1d4c97dbb9..6b92ff7235 100644 --- a/latest/usage/administration/admin_faq.html +++ b/latest/usage/administration/admin_faq.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/database_maintenance_tools.html b/latest/usage/administration/database_maintenance_tools.html index e80771d2df..2063d5f534 100644 --- a/latest/usage/administration/database_maintenance_tools.html +++ b/latest/usage/administration/database_maintenance_tools.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/index.html b/latest/usage/administration/index.html index 3366e6625e..aa1273cfe7 100644 --- a/latest/usage/administration/index.html +++ b/latest/usage/administration/index.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/request_log.html b/latest/usage/administration/request_log.html index 3ab23fa94a..f67c73b2af 100644 --- a/latest/usage/administration/request_log.html +++ b/latest/usage/administration/request_log.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/state_groups.html b/latest/usage/administration/state_groups.html index 3603e43f8c..d894b0c02e 100644 --- a/latest/usage/administration/state_groups.html +++ b/latest/usage/administration/state_groups.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/understanding_synapse_through_grafana_graphs.html b/latest/usage/administration/understanding_synapse_through_grafana_graphs.html index 24bcd6e243..6abce6e234 100644 --- a/latest/usage/administration/understanding_synapse_through_grafana_graphs.html +++ b/latest/usage/administration/understanding_synapse_through_grafana_graphs.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/administration/useful_sql_for_admins.html b/latest/usage/administration/useful_sql_for_admins.html index c3dae57839..bd895bcec3 100644 --- a/latest/usage/administration/useful_sql_for_admins.html +++ b/latest/usage/administration/useful_sql_for_admins.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/homeserver_sample_config.html b/latest/usage/configuration/homeserver_sample_config.html index 089fd78826..f61592af54 100644 --- a/latest/usage/configuration/homeserver_sample_config.html +++ b/latest/usage/configuration/homeserver_sample_config.html @@ -99,7 +99,7 @@ @@ -943,11 +943,16 @@ caches: per_cache_factors: #get_users_who_share_room_with_user: 2.0 - # Controls how long an entry can be in a cache without having been - # accessed before being evicted. Defaults to None, which means - # entries are never evicted based on time. + # Controls whether cache entries are evicted after a specified time + # period. Defaults to true. Uncomment to disable this feature. # - #expiry_time: 30m + #expire_caches: false + + # If expire_caches is enabled, this flag controls how long an entry can + # be in a cache without having been accessed before being evicted. + # Defaults to 30m. Uncomment to set a different time to live for cache entries. + # + #cache_entry_ttl: 30m # Controls how long the results of a /sync request are cached for after # a successful response is returned. A higher duration can help clients with @@ -1049,6 +1054,9 @@ log_config: "CONFDIR/SERVERNAME.log.config" # - one for ratelimiting how often a user or IP can attempt to validate a 3PID. # - two for ratelimiting how often invites can be sent in a room or to a # specific user. +# - one for ratelimiting 3PID invites (i.e. invites sent to a third-party ID +# such as an email address or a phone number) based on the account that's +# sending the invite. # # The defaults are as shown below. # @@ -1098,6 +1106,10 @@ log_config: "CONFDIR/SERVERNAME.log.config" # per_user: # per_second: 0.003 # burst_count: 5 +# +#rc_third_party_invite: +# per_second: 0.2 +# burst_count: 10 # Ratelimiting settings for incoming federation # diff --git a/latest/usage/configuration/index.html b/latest/usage/configuration/index.html index 6bd5c8e0f3..8666f6d93b 100644 --- a/latest/usage/configuration/index.html +++ b/latest/usage/configuration/index.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/logging_sample_config.html b/latest/usage/configuration/logging_sample_config.html index 67d7970dbd..e229b4b90f 100644 --- a/latest/usage/configuration/logging_sample_config.html +++ b/latest/usage/configuration/logging_sample_config.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/index.html b/latest/usage/configuration/user_authentication/index.html index c0f59bdd99..2865ed69c6 100644 --- a/latest/usage/configuration/user_authentication/index.html +++ b/latest/usage/configuration/user_authentication/index.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/refresh_tokens.html b/latest/usage/configuration/user_authentication/refresh_tokens.html index 630e575acd..17482d8d0f 100644 --- a/latest/usage/configuration/user_authentication/refresh_tokens.html +++ b/latest/usage/configuration/user_authentication/refresh_tokens.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/single_sign_on/cas.html b/latest/usage/configuration/user_authentication/single_sign_on/cas.html index db2762b219..e2be92a2f3 100644 --- a/latest/usage/configuration/user_authentication/single_sign_on/cas.html +++ b/latest/usage/configuration/user_authentication/single_sign_on/cas.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/single_sign_on/index.html b/latest/usage/configuration/user_authentication/single_sign_on/index.html index 7950eba088..4c2465802a 100644 --- a/latest/usage/configuration/user_authentication/single_sign_on/index.html +++ b/latest/usage/configuration/user_authentication/single_sign_on/index.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/single_sign_on/saml.html b/latest/usage/configuration/user_authentication/single_sign_on/saml.html index e4d84fc88a..9833c20c0c 100644 --- a/latest/usage/configuration/user_authentication/single_sign_on/saml.html +++ b/latest/usage/configuration/user_authentication/single_sign_on/saml.html @@ -99,7 +99,7 @@ -- cgit 1.5.1