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

@ -184,6 +184,10 @@ The variable allows to specify the full path to a valid TLS certificate authorit
The variable allows to activate host verification. 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/apache2``
@ -192,6 +196,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must
Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.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-apache-pgsql` images come in many flavors, each designed for a specific use case.

View File

@ -185,6 +185,10 @@ The variable allows to specify the full path to a valid TLS certificate authorit
The variable allows to activate host verification. 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/apache2``
@ -193,6 +197,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must
Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.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-apache-pgsql` images come in many flavors, each designed for a specific use case.

View File

@ -185,6 +185,10 @@ The variable allows to specify the full path to a valid TLS certificate authorit
The variable allows to activate host verification. 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/apache2``
@ -193,6 +197,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must
Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.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-apache-pgsql` images come in many flavors, each designed for a specific use case.