diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-12-21 16:01:43 +0100 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-12-22 02:01:43 +1100 |
| commit | f3561f8d86cd6359582bb0f180bb0be2364d0eb3 (patch) | |
| tree | a3ac3946ab19fe35c87cd9bbc12e2da1a6a2eca2 | |
| parent | Fix IP URL previews on Python 3 (#4215) (diff) | |
| download | synapse-f3561f8d86cd6359582bb0f180bb0be2364d0eb3.tar.xz | |
Fix indentation in default config (#4313)
These settings are not supposed to be under 'listeners'.
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/4313.bugfix | 1 | ||||
| -rw-r--r-- | synapse/config/server.py | 70 |
2 files changed, 36 insertions, 35 deletions
diff --git a/changelog.d/4313.bugfix b/changelog.d/4313.bugfix new file mode 100644 index 0000000000..d10685dd62 --- /dev/null +++ b/changelog.d/4313.bugfix @@ -0,0 +1 @@ +Fix indentation in default config diff --git a/synapse/config/server.py b/synapse/config/server.py index a9154ad462..fb4585a2d4 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -356,41 +356,41 @@ class ServerConfig(Config): # type: manhole - # Homeserver blocking - # - # How to reach the server admin, used in ResourceLimitError - # admin_contact: 'mailto:admin@server.com' - # - # Global block config - # - # hs_disabled: False - # hs_disabled_message: 'Human readable reason for why the HS is blocked' - # hs_disabled_limit_type: 'error code(str), to help clients decode reason' - # - # Monthly Active User Blocking - # - # Enables monthly active user checking - # limit_usage_by_mau: False - # max_mau_value: 50 - # mau_trial_days: 2 - # - # If enabled, the metrics for the number of monthly active users will - # be populated, however no one will be limited. If limit_usage_by_mau - # is true, this is implied to be true. - # mau_stats_only: False - # - # Sometimes the server admin will want to ensure certain accounts are - # never blocked by mau checking. These accounts are specified here. - # - # mau_limit_reserved_threepids: - # - medium: 'email' - # address: 'reserved_user@example.com' - # - # Room searching - # - # If disabled, new messages will not be indexed for searching and users - # will receive errors when searching for messages. Defaults to enabled. - # enable_search: true + # Homeserver blocking + # + # How to reach the server admin, used in ResourceLimitError + # admin_contact: 'mailto:admin@server.com' + # + # Global block config + # + # hs_disabled: False + # hs_disabled_message: 'Human readable reason for why the HS is blocked' + # hs_disabled_limit_type: 'error code(str), to help clients decode reason' + # + # Monthly Active User Blocking + # + # Enables monthly active user checking + # limit_usage_by_mau: False + # max_mau_value: 50 + # mau_trial_days: 2 + # + # If enabled, the metrics for the number of monthly active users will + # be populated, however no one will be limited. If limit_usage_by_mau + # is true, this is implied to be true. + # mau_stats_only: False + # + # Sometimes the server admin will want to ensure certain accounts are + # never blocked by mau checking. These accounts are specified here. + # + # mau_limit_reserved_threepids: + # - medium: 'email' + # address: 'reserved_user@example.com' + # + # Room searching + # + # If disabled, new messages will not be indexed for searching and users + # will receive errors when searching for messages. Defaults to enabled. + # enable_search: true """ % locals() def read_arguments(self, args): |