gh-pages
erikjohnston 2022-07-25 15:28:01 +00:00
parent 71e01b4e8e
commit b02c7618a2
4 changed files with 22 additions and 4 deletions

View File

@ -5858,13 +5858,21 @@ adding a 3PID).</p>
<p><code>smtp_host</code>: The hostname of the outgoing SMTP server to use. Defaults to 'localhost'.</p> <p><code>smtp_host</code>: The hostname of the outgoing SMTP server to use. Defaults to 'localhost'.</p>
</li> </li>
<li> <li>
<p><code>smtp_port</code>: The port on the mail server for outgoing SMTP. Defaults to 25.</p> <p><code>smtp_port</code>: The port on the mail server for outgoing SMTP. Defaults to 465 if <code>force_tls</code> is true, else 25.</p>
<p><em>Changed in Synapse 1.64.0:</em> the default port is now aware of <code>force_tls</code>.</p>
</li> </li>
<li> <li>
<p><code>smtp_user</code> and <code>smtp_pass</code>: Username/password for authentication to the SMTP server. By default, no <p><code>smtp_user</code> and <code>smtp_pass</code>: Username/password for authentication to the SMTP server. By default, no
authentication is attempted.</p> authentication is attempted.</p>
</li> </li>
<li> <li>
<p><code>force_tls</code>: By default, Synapse connects over plain text and then optionally upgrades
to TLS via STARTTLS. If this option is set to true, TLS is used from the start (Implicit TLS),
and the option <code>require_transport_security</code> is ignored.
It is recommended to enable this if supported by your mail server.</p>
<p><em>New in Synapse 1.64.0.</em></p>
</li>
<li>
<p><code>require_transport_security</code>: Set to true to require TLS transport security for SMTP. <p><code>require_transport_security</code>: Set to true to require TLS transport security for SMTP.
By default, Synapse will connect over plain text, and will then switch to By default, Synapse will connect over plain text, and will then switch to
TLS via STARTTLS <em>if the SMTP server supports it</em>. If this option is set, TLS via STARTTLS <em>if the SMTP server supports it</em>. If this option is set,
@ -5948,6 +5956,7 @@ ownership. Defaults to &quot;[%(server_name)s] Validate your email&quot;</li>
smtp_port: 587 smtp_port: 587
smtp_user: &quot;exampleusername&quot; smtp_user: &quot;exampleusername&quot;
smtp_pass: &quot;examplepassword&quot; smtp_pass: &quot;examplepassword&quot;
force_tls: true
require_transport_security: true require_transport_security: true
enable_tls: false enable_tls: false
notif_from: &quot;Your Friendly %(app)s homeserver &lt;noreply@example.com&gt;&quot; notif_from: &quot;Your Friendly %(app)s homeserver &lt;noreply@example.com&gt;&quot;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2823,13 +2823,21 @@ adding a 3PID).</p>
<p><code>smtp_host</code>: The hostname of the outgoing SMTP server to use. Defaults to 'localhost'.</p> <p><code>smtp_host</code>: The hostname of the outgoing SMTP server to use. Defaults to 'localhost'.</p>
</li> </li>
<li> <li>
<p><code>smtp_port</code>: The port on the mail server for outgoing SMTP. Defaults to 25.</p> <p><code>smtp_port</code>: The port on the mail server for outgoing SMTP. Defaults to 465 if <code>force_tls</code> is true, else 25.</p>
<p><em>Changed in Synapse 1.64.0:</em> the default port is now aware of <code>force_tls</code>.</p>
</li> </li>
<li> <li>
<p><code>smtp_user</code> and <code>smtp_pass</code>: Username/password for authentication to the SMTP server. By default, no <p><code>smtp_user</code> and <code>smtp_pass</code>: Username/password for authentication to the SMTP server. By default, no
authentication is attempted.</p> authentication is attempted.</p>
</li> </li>
<li> <li>
<p><code>force_tls</code>: By default, Synapse connects over plain text and then optionally upgrades
to TLS via STARTTLS. If this option is set to true, TLS is used from the start (Implicit TLS),
and the option <code>require_transport_security</code> is ignored.
It is recommended to enable this if supported by your mail server.</p>
<p><em>New in Synapse 1.64.0.</em></p>
</li>
<li>
<p><code>require_transport_security</code>: Set to true to require TLS transport security for SMTP. <p><code>require_transport_security</code>: Set to true to require TLS transport security for SMTP.
By default, Synapse will connect over plain text, and will then switch to By default, Synapse will connect over plain text, and will then switch to
TLS via STARTTLS <em>if the SMTP server supports it</em>. If this option is set, TLS via STARTTLS <em>if the SMTP server supports it</em>. If this option is set,
@ -2913,6 +2921,7 @@ ownership. Defaults to &quot;[%(server_name)s] Validate your email&quot;</li>
smtp_port: 587 smtp_port: 587
smtp_user: &quot;exampleusername&quot; smtp_user: &quot;exampleusername&quot;
smtp_pass: &quot;examplepassword&quot; smtp_pass: &quot;examplepassword&quot;
force_tls: true
require_transport_security: true require_transport_security: true
enable_tls: false enable_tls: false
notif_from: &quot;Your Friendly %(app)s homeserver &lt;noreply@example.com&gt;&quot; notif_from: &quot;Your Friendly %(app)s homeserver &lt;noreply@example.com&gt;&quot;