diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-06 14:17:56 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-06 14:17:56 +0100 |
| commit | a37a2f13cf1e2d46db65e0281340111140cbc993 (patch) | |
| tree | eab0dbea3657faf7db2c10b8a7e4fc7ff39b7a77 | |
| parent | Address review comments (diff) | |
| download | synapse-a37a2f13cf1e2d46db65e0281340111140cbc993.tar.xz | |
regen sample config
| -rw-r--r-- | docs/sample_config.yaml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 10b0dfc113..efc3738243 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1025,6 +1025,7 @@ password_config: # smtp_pass variables should be used # #email: +# enable_notifs: False # smtp_host: "localhost" # smtp_port: 25 # SSL: 465, STARTTLS: 587 # smtp_user: "exampleusername" @@ -1033,10 +1034,6 @@ password_config: # notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>" # app_name: Matrix # -# # Enable sending email notifications for new chat messages -# # -# enable_notifs: False -# # # Enable email notifications by default # notif_for_new_users: True # @@ -1045,7 +1042,7 @@ password_config: # # the "app_name" setting is ignored # riot_base_url: "http://localhost/riot" # -# # Disable sending password reset emails via the configured, trusted +# # Enable sending password reset emails via the configured, trusted # # identity servers # # # # IMPORTANT! This will give a malicious or overtaken identity server @@ -1053,13 +1050,15 @@ password_config: # # that you want to do this! It is strongly recommended that password # # reset emails be sent by the homeserver instead # # -# #enable_password_reset_from_is: False +# # If this option is set to false and SMTP options have not been +# # configured, resetting user passwords via email will be disabled +# #trust_identity_server_for_password_resets: false # -# # Configure the time in seconds that a validation email or text -# # message code will expire after sending +# # Configure the time that a validation email or text message code +# # will expire after sending # # # # This is currently used for password resets -# #validation_token_lifetime: 900 # 15 minutes +# #validation_token_lifetime: 1h # # # Template directory. All template files should be stored within this # # directory |