Merge branch 'master' into 5.0

This commit is contained in:
Alexey Pustovalov
2020-09-11 03:23:04 -04:00
14 changed files with 100 additions and 1 deletions

View File

@ -192,6 +192,10 @@ The variable allows to activate host verification. Available since 5.0.0.
The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0.
## `ZBX_SSO_SETTINGS`
The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0.
## Allowed volumes for the Zabbix web interface container
### ``/etc/ssl/nginx``
@ -200,6 +204,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must
Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files.
### ``/etc/zabbix/web/certs``
The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0.
# The image variants
The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case.