tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix indentation in default config (#4313)

Browse source 
These settings are not supposed to be under 'listeners'.
This commit is contained in:
Richard van der Hoff 2018-12-21 16:01:43 +01:00 committed by Amber Brown
parent ea6abf6724
commit f3561f8d86
2 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4313.bugfix Normal file
View file

@ -0,0 +1 @@
Fix indentation in default config

70
synapse/config/server.py
View file

@ -356,41 +356,41 @@ class ServerConfig(Config):
# type: manhole # type: manhole
# Homeserver blocking # Homeserver blocking
# #
# How to reach the server admin, used in ResourceLimitError # How to reach the server admin, used in ResourceLimitError
# admin_contact: 'mailto:admin@server.com' # admin_contact: 'mailto:admin@server.com'
# #
# Global block config # Global block config
# #
# hs_disabled: False # hs_disabled: False
# hs_disabled_message: 'Human readable reason for why the HS is blocked' # hs_disabled_message: 'Human readable reason for why the HS is blocked'
# hs_disabled_limit_type: 'error code(str), to help clients decode reason' # hs_disabled_limit_type: 'error code(str), to help clients decode reason'
# #
# Monthly Active User Blocking # Monthly Active User Blocking
# #
# Enables monthly active user checking # Enables monthly active user checking
# limit_usage_by_mau: False # limit_usage_by_mau: False
# max_mau_value: 50 # max_mau_value: 50
# mau_trial_days: 2 # mau_trial_days: 2
# #
# If enabled, the metrics for the number of monthly active users will # 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 # be populated, however no one will be limited. If limit_usage_by_mau
# is true, this is implied to be true. # is true, this is implied to be true.
# mau_stats_only: False # mau_stats_only: False
# #
# Sometimes the server admin will want to ensure certain accounts are # Sometimes the server admin will want to ensure certain accounts are
# never blocked by mau checking. These accounts are specified here. # never blocked by mau checking. These accounts are specified here.
# #
# mau_limit_reserved_threepids: # mau_limit_reserved_threepids:
# - medium: 'email' # - medium: 'email'
# address: 'reserved_user@example.com' # address: 'reserved_user@example.com'
# #
# Room searching # Room searching
# #
# If disabled, new messages will not be indexed for searching and users # If disabled, new messages will not be indexed for searching and users
# will receive errors when searching for messages. Defaults to enabled. # will receive errors when searching for messages. Defaults to enabled.
# enable_search: true # enable_search: true
""" % locals() """ % locals()
def read_arguments(self, args): def read_arguments(self, args):