Skip to content

Commit abadc49

Browse files
committed
data/settings: Clarify ssl vs inet_listener_ssl settings
1 parent 0bb8908 commit abadc49

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

data/settings.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6855,7 +6855,10 @@ try to initialize encryption if the global [[setting,ssl]] is \`yes\`. This is
68556855
for example done to accommodate STARTTLS commands for IMAP/SUBMISSION/LMTP
68566856
protocols. In other words, SSL is truly disabled only when the global
68576857
[[setting,ssl]] is \`no\`.
6858-
:::`
6858+
:::
6859+
6860+
Note: Do not confuse this with the [[setting,ssl]] setting. When used as
6861+
\`inet_listener { ssl }\`, it expands to this \`inet_listener_ssl\` setting.`
68596862
},
68606863

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

1032910332
ssl: {
1033010333
default: 'yes',
10331-
seealso: [ '[[link,ssl_configuration]]' ],
10334+
seealso: [ '[[link,ssl_configuration]]', 'inet_listener_ssl' ],
1033210335
values: setting_types.ENUM,
1033310336
values_enum: [ 'yes', 'no', 'required' ],
1033410337
text: `
@@ -10350,7 +10353,10 @@ Options:
1035010353
authentication mechanisms aren't allowed without SSL/TLS.
1035110354
1035210355
This setting affects the \`secured\` state of connections. See
10353-
[[link,secured_connections]].`
10356+
[[link,secured_connections]].
10357+
10358+
Note: Do not confuse this with the [[setting,inet_listener_ssl]] setting,
10359+
which gets used inside \`inet_listener { ssl }\`.`
1035410360
},
1035510361

1035610362
ssl_server_alt_cert_file: {

0 commit comments

Comments
 (0)