diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
| commit | 7f0d8e42885078583d1eab16df2523292ed1148d (patch) | |
| tree | 97d56ee3dd35549820a69b702d574d1704560773 /docker/conf | |
| parent | Assume key existence. Update docstrings (diff) | |
| parent | remove dead transaction persist code (#5622) (diff) | |
| download | synapse-7f0d8e42885078583d1eab16df2523292ed1148d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfiltrate_data
Diffstat (limited to 'docker/conf')
| -rw-r--r-- | docker/conf/homeserver.yaml | 19 | ||||
| -rw-r--r-- | docker/conf/log.config | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml index b0267b1c60..c1110f0f53 100644 --- a/docker/conf/homeserver.yaml +++ b/docker/conf/homeserver.yaml @@ -207,22 +207,3 @@ perspectives: password_config: enabled: true - -{% if SYNAPSE_SMTP_HOST %} -email: - enable_notifs: false - smtp_host: "{{ SYNAPSE_SMTP_HOST }}" - smtp_port: {{ SYNAPSE_SMTP_PORT or "25" }} - smtp_user: "{{ SYNAPSE_SMTP_USER }}" - smtp_pass: "{{ SYNAPSE_SMTP_PASSWORD }}" - require_transport_security: False - notif_from: "{{ SYNAPSE_SMTP_FROM or "hostmaster@" + SYNAPSE_SERVER_NAME }}" - 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: "https://{{ SYNAPSE_SERVER_NAME }}" -{% endif %} diff --git a/docker/conf/log.config b/docker/conf/log.config index 895e45d20b..ea5ccfd68b 100644 --- a/docker/conf/log.config +++ b/docker/conf/log.config @@ -6,7 +6,7 @@ formatters: filters: context: - (): synapse.util.logcontext.LoggingContextFilter + (): synapse.logging.context.LoggingContextFilter request: "" handlers: |