Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions data/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -6855,7 +6855,10 @@ try to initialize encryption if the global [[setting,ssl]] is \`yes\`. This is
for example done to accommodate STARTTLS commands for IMAP/SUBMISSION/LMTP
protocols. In other words, SSL is truly disabled only when the global
[[setting,ssl]] is \`no\`.
:::`
:::

Note: Do not confuse this with the [[setting,ssl]] setting. When used as
\`inet_listener { ssl }\`, it expands to this \`inet_listener_ssl\` setting.`
},

inet_listener_haproxy: {
Expand Down Expand Up @@ -10328,7 +10331,7 @@ SQL driver to use for any SQL database accesses.`

ssl: {
default: 'yes',
seealso: [ '[[link,ssl_configuration]]' ],
seealso: [ '[[link,ssl_configuration]]', 'inet_listener_ssl' ],
values: setting_types.ENUM,
values_enum: [ 'yes', 'no', 'required' ],
text: `
Expand All @@ -10350,7 +10353,10 @@ Options:
authentication mechanisms aren't allowed without SSL/TLS.

This setting affects the \`secured\` state of connections. See
[[link,secured_connections]].`
[[link,secured_connections]].

Note: Do not confuse this with the [[setting,inet_listener_ssl]] setting,
which gets used inside \`inet_listener { ssl }\`.`
},

ssl_server_alt_cert_file: {
Expand Down