Skip to content

Commit 4018a54

Browse files
sirainencmouse
authored andcommitted
settings, config: Add ssl-ldap setting tags
1 parent 7fb66c0 commit 4018a54

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

data/settings.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10097,6 +10097,7 @@ Note: [[setting,auth_ssl_username_from_cert]] MUST be enabled.`
1009710097
ssl_cipher_list: {
1009810098
default: 'ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH',
1009910099
seealso: [ 'ssl', 'ssl_cipher_suites', 'ssl_min_protocol', '[[link,ssl_configuration]]' ],
10100+
tags: [ 'ssl-ldap' ],
1010010101
values: setting_types.STRING,
1010110102
text: `
1010210103
The list of SSL ciphers to use for TLSv1.2 and below connections, in order
@@ -10123,6 +10124,7 @@ See: https://wiki.openssl.org/index.php/TLS1.3#Ciphersuites`
1012310124

1012410125
ssl_client_ca_dir: {
1012510126
seealso: [ 'ssl', '[[link,ssl_configuration]]' ],
10127+
tags: [ 'ssl-ldap' ],
1012610128
values: setting_types.STRING,
1012710129
text: `
1012810130
The directory where trusted SSL CA certificates can be found. For example
@@ -10135,6 +10137,7 @@ operation instead of all the root CAs.`
1013510137
},
1013610138

1013710139
ssl_client_ca_file: {
10140+
tags: [ 'ssl-ldap' ],
1013810141
seealso: [ 'ssl', '[[link,ssl_configuration]]' ],
1013910142
values: setting_types.FILE,
1014010143
text: `
@@ -10158,6 +10161,7 @@ the server operation.`
1015810161
'ssl_client_key_file',
1015910162
'[[link,ssl_configuration]]',
1016010163
],
10164+
tags: [ 'ssl-ldap' ],
1016110165
values: setting_types.FILE,
1016210166
text: `
1016310167
Public SSL certificate used for outgoing SSL connections. This is generally
@@ -10179,6 +10183,7 @@ ssl_client_key_file = /etc/dovecot/dovecot-client.key
1017910183
'ssl_client_cert_file',
1018010184
'[[link,ssl_configuration]]',
1018110185
],
10186+
tags: [ 'ssl-ldap' ],
1018210187
values: setting_types.FILE,
1018310188
text: `
1018410189
Private key for [[setting,ssl_client_cert_file]]. If it is password protected,
@@ -10211,6 +10216,7 @@ Which SSL crypto device to use.`
1021110216
ssl_curve_list: {
1021210217
default: '\\<defaults from the SSL library\\>',
1021310218
seealso: [ 'ssl', '[[link,ssl_configuration]]' ],
10219+
tags: [ 'ssl-ldap' ],
1021410220
values: setting_types.STRING,
1021510221
text: `
1021610222
Colon separated list of elliptic curves to use, in order of preference.
@@ -10246,6 +10252,7 @@ ssl_dh_file = /path/to/dh.pem
1024610252
ssl_client_require_valid_cert: {
1024710253
default: 'yes',
1024810254
seealso: [ 'ssl', '[[link,ssl_configuration]]' ],
10255+
tags: [ 'ssl-ldap' ],
1024910256
values: setting_types.BOOLEAN,
1025010257
text: `
1025110258
Require a valid certificate when connecting to external SSL services?`
@@ -10288,6 +10295,7 @@ Alternatively, you can supply the password via the -p parameter at startup.`
1028810295
ssl_min_protocol: {
1028910296
default: 'TLSv1.2',
1029010297
seealso: [ 'ssl', 'ssl_cipher_list', '[[link,ssl_configuration]]' ],
10298+
tags: [ 'ssl-ldap' ],
1029110299
values: setting_types.STRING,
1029210300
text: `
1029310301
The minimum SSL protocol version Dovecot accepts.

docs/core/config/auth/databases/ldap.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,11 @@ You can enable TLS in two alternative ways:
291291
* Connect to ldap port (389) and use STARTTLS command. Use [[setting,ssl,yes]] to
292292
enable this.
293293

294-
See the [[link,ssl_configuration]] settings for how to configure TLS.
294+
See the [[link,ssl_configuration]] settings for how to configure TLS. Not all
295+
of Dovecot SSL settings are supported by the LDAP library. Below is the list
296+
of supported settings:
297+
298+
<SettingsComponent tag="ssl-ldap" level="2" />
295299

296300
#### Custom Certs
297301

docs/core/config/dict.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ dict_legacy {
9090
#### LDAP Settings
9191

9292
<SettingsComponent tag="dict-ldap" level="2" />
93+
<SettingsComponent tag="ssl-ldap" level="2" />
9394

9495
#### Examples
9596

0 commit comments

Comments
 (0)