From 59cc7f0867fa9ff1d7c4603c8199e7c827070faf Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 22 Apr 2020 13:50:40 +0100 Subject: [PATCH] here's hoping Synapse doesn't actually try to send an email :D Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../config-templates/consent/homeserver.yaml | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml index f9e62c94a6..536c017b9e 100644 --- a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml +++ b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml @@ -643,7 +643,6 @@ enable_registration: true # flow (overrides registrations_require_3pid if MSISDNs are set as required) # disable_msisdn_registration: false -threepid_behaviour_email: "local" # Mandate that users are only allowed to associate certain formats of # 3PIDs with accounts on this server. @@ -883,22 +882,22 @@ password_config: # If your SMTP server requires authentication, the optional smtp_user & # smtp_pass variables should be used # -#email: -# enable_notifs: false -# smtp_host: "localhost" -# smtp_port: 25 -# smtp_user: "exampleusername" -# smtp_pass: "examplepassword" -# require_transport_security: False -# notif_from: "Your Friendly %(app)s Home Server " -# app_name: Matrix -# # if template_dir is unset, uses the example templates that are part of -# # the Synapse distribution. -# #template_dir: res/templates -# notif_template_html: notif_mail.html -# notif_template_text: notif_mail.txt -# notif_for_new_users: True -# riot_base_url: "http://localhost/riot" +email: + enable_notifs: false + smtp_host: "localhost" + smtp_port: 25 + smtp_user: "exampleusername" + smtp_pass: "examplepassword" + require_transport_security: False + notif_from: "Your Friendly %(app)s Home Server " + app_name: Matrix + # if template_dir is unset, uses the example templates that are part of + # the Synapse distribution. + #template_dir: res/templates + notif_template_html: notif_mail.html + notif_template_text: notif_mail.txt + notif_for_new_users: True + riot_base_url: "http://localhost/riot" #password_providers: