diff options
| author | Martins Abele <martins.abele@zabbix.com> | 2020-01-31 17:05:48 +0300 |
|---|---|---|
| committer | Martins Abele <martins.abele@zabbix.com> | 2020-02-04 15:31:58 +0300 |
| commit | 255d33c8b5307cb2cd4542450a13b0d276d086b6 (patch) | |
| tree | 91429ae9506e31717115c122c742025c10c5c203 /conf | |
| parent | d54ae16fb68f661fa2cd0a31785b64847f66cbf4 (diff) | |
.......PS. [ZBXNEXT-5641] renamed server configuration option
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/zabbix_proxy.conf | 11 | ||||
| -rw-r--r-- | conf/zabbix_server.conf | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf index a27d786c6b1..d1607a15d62 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -737,14 +737,14 @@ StatsAllowedIP=127.0.0.1 # Default: # TLSPSKFile= -### Option: DBTLSMode +### Option: DBTLSConnect # Database connection TLS mode +# Possible values: preferred, required, verify_ca, verify_full # Supported only for MySQL and Postgres -# Possible values: disable, require, verify-ca, verify-identity # # Mandatory: no # Default: -# DBTLSMode=prefer +# DBTLSConnect=preferred ### Option: DBTLSCertFile # Full pathname of file containing client certificate for @@ -768,14 +768,13 @@ StatsAllowedIP=127.0.0.1 # Full pathname of a file containing the top-level CA(s) certificates for # database server certificate verification. # Supported only for MySQL and Postgres -# MySQL: This option, if used, must specify the same certificate used by the database server # -# Mandatory: no (yes, if DBTLSMode set to one of: verify-ca, verify-identity) +# Mandatory: no (yes, if DBTLSMode set to one of: verify_ca, verify_full) # Default: # DBTLSCAFile= ### Option: DBTLSCipher -# The list of permissible ciphers for database TLS encryption +# The colon separated list of permissible ciphers for database TLS encryption # Supported only for MySQL # # Mandatory no diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf index 6635383e19b..a0053586106 100644 --- a/conf/zabbix_server.conf +++ b/conf/zabbix_server.conf @@ -721,14 +721,14 @@ StatsAllowedIP=127.0.0.1 # Default: # TLSKeyFile= -### Option: DBTLSMode +### Option: DBTLSConnect # Database connection TLS mode -# Possible values: disable, require, verify-ca, verify-identity +# Possible values: preferred, required, verify_ca, verify_full # Supported only for MySQL and Postgres # # Mandatory: no # Default: -# DBTLSMode=prefer +# DBTLSConnect=preferred ### Option: DBTLSCertFile # Full pathname of file containing client certificate for @@ -752,14 +752,13 @@ StatsAllowedIP=127.0.0.1 # Full pathname of a file containing the top-level CA(s) certificates for # database server certificate verification. # Supported only for MySQL and Postgres -# MySQL: This option, if used, must specify the same certificate used by the database server. # -# Mandatory: no (yes, if DBTLSMode set to one of: verify-ca, verify-identity) +# Mandatory: no (yes, if DBTLSMode set to one of: verify_ca, verify_full) # Default: # DBTLSCAFile= ### Option: DBTLSCipher -# The list of permissible ciphers for database TLS encryption +# The colon separated list of permissible ciphers for database TLS encryption # Supported only for MySQL # # Mandatory no |