diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-07-01 14:21:03 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-07-01 14:21:03 +0100 |
| commit | b4fd86a9b406dca213d5ae94df698533491936e3 (patch) | |
| tree | 6c466f5921e990a2a582efd926b1eef8204e24db /synapse/config/emailconfig.py | |
| parent | Address review comments (diff) | |
| parent | Make the http server handle coroutine-making REST servlets (#5475) (diff) | |
| download | synapse-b4fd86a9b406dca213d5ae94df698533491936e3.tar.xz | |
Merge branch 'develop' into rav/saml2_client
Diffstat (limited to 'synapse/config/emailconfig.py')
| -rw-r--r-- | synapse/config/emailconfig.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index cf39936da7..fcd55d3e3d 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -233,11 +233,13 @@ class EmailConfig(Config): # app_name: Matrix # # # Enable email notifications by default + # # # notif_for_new_users: True # # # Defining a custom URL for Riot is only needed if email notifications # # should contain links to a self-hosted installation of Riot; when set # # the "app_name" setting is ignored + # # # riot_base_url: "http://localhost/riot" # # # Enable sending password reset emails via the configured, trusted @@ -250,16 +252,22 @@ class EmailConfig(Config): # # # # 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 that a validation email or text message code # # will expire after sending # # # # This is currently used for password resets + # # # #validation_token_lifetime: 1h # # # Template directory. All template files should be stored within this - # # directory + # # directory. If not set, default templates from within the Synapse + # # package will be used + # # + # # For the list of default templates, please see + # # https://github.com/matrix-org/synapse/tree/master/synapse/res/templates # # # #template_dir: res/templates # |