Skip to content

Commit 4de48a8

Browse files
sirainencmouse
authored andcommitted
settings, config: Add ssl-mysql setting tags
1 parent 545f400 commit 4de48a8

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

data/settings.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10097,7 +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' ],
10100+
tags: [ 'ssl-ldap', 'sql-mysql' ],
1010110101
values: setting_types.STRING,
1010210102
text: `
1010310103
The list of SSL ciphers to use for TLSv1.2 and below connections, in order
@@ -10124,7 +10124,7 @@ See: https://wiki.openssl.org/index.php/TLS1.3#Ciphersuites`
1012410124

1012510125
ssl_client_ca_dir: {
1012610126
seealso: [ 'ssl', '[[link,ssl_configuration]]' ],
10127-
tags: [ 'ssl-ldap' ],
10127+
tags: [ 'ssl-ldap', 'sql-mysql' ],
1012810128
values: setting_types.STRING,
1012910129
text: `
1013010130
The directory where trusted SSL CA certificates can be found. For example
@@ -10137,7 +10137,7 @@ operation instead of all the root CAs.`
1013710137
},
1013810138

1013910139
ssl_client_ca_file: {
10140-
tags: [ 'ssl-ldap', 'ssl-cassandra' ],
10140+
tags: [ 'ssl-ldap', 'ssl-cassandra', 'sql-mysql' ],
1014110141
seealso: [ 'ssl', '[[link,ssl_configuration]]' ],
1014210142
values: setting_types.FILE,
1014310143
text: `
@@ -10161,7 +10161,7 @@ the server operation.`
1016110161
'ssl_client_key_file',
1016210162
'[[link,ssl_configuration]]',
1016310163
],
10164-
tags: [ 'ssl-ldap', 'ssl-cassandra' ],
10164+
tags: [ 'ssl-ldap', 'ssl-cassandra', 'sql-mysql' ],
1016510165
values: setting_types.FILE,
1016610166
text: `
1016710167
Public SSL certificate used for outgoing SSL connections. This is generally
@@ -10183,7 +10183,7 @@ ssl_client_key_file = /etc/dovecot/dovecot-client.key
1018310183
'ssl_client_cert_file',
1018410184
'[[link,ssl_configuration]]',
1018510185
],
10186-
tags: [ 'ssl-ldap', 'ssl-cassandra' ],
10186+
tags: [ 'ssl-ldap', 'ssl-cassandra', 'sql-mysql' ],
1018710187
values: setting_types.FILE,
1018810188
text: `
1018910189
Private key for [[setting,ssl_client_cert_file]]. If it is password protected,
@@ -10253,7 +10253,7 @@ ssl_dh_file = /path/to/dh.pem
1025310253
ssl_client_require_valid_cert: {
1025410254
default: 'yes',
1025510255
seealso: [ 'ssl', '[[link,ssl_configuration]]' ],
10256-
tags: [ 'ssl-ldap', 'ssl-cassandra' ],
10256+
tags: [ 'ssl-ldap', 'ssl-cassandra', 'sql-mysql' ],
1025710257
values: setting_types.BOOLEAN,
1025810258
text: `
1025910259
Require a valid certificate when connecting to external SSL services?`

docs/core/config/sql/mysql.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,10 @@ For MariaDB, you need to have compatibility headers installed.
1919
## Settings
2020

2121
<SettingsComponent tag="sql-mysql" />
22+
23+
## SSL/TLS Settings
24+
25+
Not all of Dovecot SSL settings are supported by the MySQL library. Below
26+
is the list of supported settings:
27+
28+
<SettingsComponent tag="ssl-mysql" />

0 commit comments

Comments
 (0)