diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-06-05 16:32:35 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-06-05 16:32:35 +0100 |
| commit | 7603a706eb96305d804da05030a71288fcc255ab (patch) | |
| tree | d59bcc7827bc6b038d5c3e7bc46677a84007e255 /synapse/config | |
| parent | Update sample config (diff) | |
| parent | Fix `federation_custom_ca_list` configuration option. (diff) | |
| download | synapse-7603a706eb96305d804da05030a71288fcc255ab.tar.xz | |
Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 16 | ||||
| -rw-r--r-- | synapse/config/tls.py | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index e763e19e15..334921d421 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -585,6 +585,22 @@ class ServerConfig(Config): # Monthly Active User Blocking # + # Used in cases where the admin or server owner wants to limit to the + # number of monthly active users. + # + # 'limit_usage_by_mau' disables/enables monthly active user blocking. When + # anabled and a limit is reached the server returns a 'ResourceLimitError' + # with error type Codes.RESOURCE_LIMIT_EXCEEDED + # + # 'max_mau_value' is the hard limit of monthly active users above which + # the server will start blocking user actions. + # + # 'mau_trial_days' is a means to add a grace period for active users. It + # means that users must be active for this number of days before they + # can be considered active and guards against the case where lots of users + # sign up in a short space of time never to return after their initial + # session. + # #limit_usage_by_mau: False #max_mau_value: 50 #mau_trial_days: 2 diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 43712b8213..658f9dd361 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -107,7 +107,7 @@ class TlsConfig(Config): certs = [] for ca_file in custom_ca_list: logger.debug("Reading custom CA certificate file: %s", ca_file) - content = self.read_file(ca_file) + content = self.read_file(ca_file, "federation_custom_ca_list") # Parse the CA certificates try: |