summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-06-05 17:37:50 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-06-05 17:37:50 +0100
commit6a9588cc60962158868fa271f73c7f45a2854a17 (patch)
treebe5e2decddb3ccb8842c5f2eebbdd8b456a9e04d
parentOnly import jinja2/bleach if we need it (diff)
downloadsynapse-6a9588cc60962158868fa271f73c7f45a2854a17.tar.xz
Update sample config
-rw-r--r--docs/sample_config.yaml12
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 859df5b636..0b47a55941 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1006,6 +1006,18 @@ signing_key_path: "CONFDIR/SERVERNAME.signing.key"
 #   algorithm: "HS256"
 
 
+# Allow users to reset their password
+#
+# Resetting a user's password is done either by sending a token from
+# Synapse, or asking an identity server to do so. In Synapse v1.0,
+# sending a password reset token from an identity server was turned off
+# by default for security reasons.
+#
+# If enable_password_reset_from_is is False, you must fill out the
+# "email" section of the config before enabling password resets
+#
+#enable_password_resets: False
+
 password_config:
    # Uncomment to disable password login
    #