mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-07 18:03:10 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
eb9a0d9e48
16
INSTALL.md
16
INSTALL.md
@ -413,16 +413,18 @@ For a more detailed guide to configuring your server for federation, see
|
|||||||
|
|
||||||
## Email
|
## Email
|
||||||
|
|
||||||
It is desirable for Synapse to have the capability to send email. For example,
|
It is desirable for Synapse to have the capability to send email. This allows
|
||||||
this is required to support the 'password reset' feature.
|
Synapse to send password reset emails, send verifications when an email address
|
||||||
|
is added to a user's account, and send email notifications to users when they
|
||||||
|
receive new messages.
|
||||||
|
|
||||||
To configure an SMTP server for Synapse, modify the configuration section
|
To configure an SMTP server for Synapse, modify the configuration section
|
||||||
headed ``email``, and be sure to have at least the ``smtp_host``, ``smtp_port``
|
headed `email`, and be sure to have at least the `smtp_host`, `smtp_port`
|
||||||
and ``notif_from`` fields filled out. You may also need to set ``smtp_user``,
|
and `notif_from` fields filled out. You may also need to set `smtp_user`,
|
||||||
``smtp_pass``, and ``require_transport_security``.
|
`smtp_pass`, and `require_transport_security`.
|
||||||
|
|
||||||
If Synapse is not configured with an SMTP server, password reset via email will
|
If email is not configured, password reset, registration and notifications via
|
||||||
be disabled by default.
|
email will be disabled.
|
||||||
|
|
||||||
## Registering a user
|
## Registering a user
|
||||||
|
|
||||||
|
1
changelog.d/6272.doc
Normal file
1
changelog.d/6272.doc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Update `INSTALL.md` Email section to talk about `account_threepid_delegates`.
|
@ -217,8 +217,9 @@ def main(args, environ):
|
|||||||
# backwards-compatibility generate-a-config-on-the-fly mode
|
# backwards-compatibility generate-a-config-on-the-fly mode
|
||||||
if "SYNAPSE_CONFIG_PATH" in environ:
|
if "SYNAPSE_CONFIG_PATH" in environ:
|
||||||
error(
|
error(
|
||||||
"SYNAPSE_SERVER_NAME and SYNAPSE_CONFIG_PATH are mutually exclusive "
|
"SYNAPSE_SERVER_NAME can only be combined with SYNAPSE_CONFIG_PATH "
|
||||||
"except in `generate` or `migrate_config` mode."
|
"in `generate` or `migrate_config` mode. To start synapse using a "
|
||||||
|
"config file, unset the SYNAPSE_SERVER_NAME environment variable."
|
||||||
)
|
)
|
||||||
|
|
||||||
config_path = "/compiled/homeserver.yaml"
|
config_path = "/compiled/homeserver.yaml"
|
||||||
|
Loading…
Reference in New Issue
Block a user