diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-10-31 11:17:05 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-10-31 11:17:05 +0000 |
| commit | eb9a0d9e48cb28987dd795293803217427721b8c (patch) | |
| tree | 9124a2575bb845eabea6056fc0ad7b651f996cc1 | |
| parent | Remove usage of deprecated logger.warn method from codebase (#6271) (diff) | |
| parent | Update email section of INSTALL.md about account_threepid_delegates (#6272) (diff) | |
| download | synapse-eb9a0d9e48cb28987dd795293803217427721b8c.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | INSTALL.md | 16 | ||||
| -rw-r--r-- | changelog.d/6272.doc | 1 | ||||
| -rwxr-xr-x | docker/start.py | 5 |
3 files changed, 13 insertions, 9 deletions
diff --git a/INSTALL.md b/INSTALL.md index 69e423923b..e7b429c05d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -413,16 +413,18 @@ For a more detailed guide to configuring your server for federation, see ## Email -It is desirable for Synapse to have the capability to send email. For example, -this is required to support the 'password reset' feature. +It is desirable for Synapse to have the capability to send email. This allows +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 -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``, -``smtp_pass``, and ``require_transport_security``. +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`, +`smtp_pass`, and `require_transport_security`. -If Synapse is not configured with an SMTP server, password reset via email will - be disabled by default. +If email is not configured, password reset, registration and notifications via +email will be disabled. ## Registering a user diff --git a/changelog.d/6272.doc b/changelog.d/6272.doc new file mode 100644 index 0000000000..232180bcdc --- /dev/null +++ b/changelog.d/6272.doc @@ -0,0 +1 @@ +Update `INSTALL.md` Email section to talk about `account_threepid_delegates`. \ No newline at end of file diff --git a/docker/start.py b/docker/start.py index e41ea20e70..6e1cb807a1 100755 --- a/docker/start.py +++ b/docker/start.py @@ -217,8 +217,9 @@ def main(args, environ): # backwards-compatibility generate-a-config-on-the-fly mode if "SYNAPSE_CONFIG_PATH" in environ: error( - "SYNAPSE_SERVER_NAME and SYNAPSE_CONFIG_PATH are mutually exclusive " - "except in `generate` or `migrate_config` mode." + "SYNAPSE_SERVER_NAME can only be combined with SYNAPSE_CONFIG_PATH " + "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" |