Merge branch 'master' into 5.0

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

View File

@ -1,5 +1,8 @@
![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png)
![CI](https://github.com/zabbix/zabbix-docker/workflows/CI/badge.svg?branch=master&event=release)
![CI](https://github.com/zabbix/zabbix-docker/workflows/CI/badge.svg?branch=master&event=push)
# What is Zabbix?
Zabbix is an enterprise-class open source distributed monitoring solution.

View File

@ -190,6 +190,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/apache2``
@ -198,6 +202,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-mysql` images come in many flavors, each designed for a specific use case.

View File

@ -190,6 +190,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/apache2``
@ -198,6 +202,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-mysql` images come in many flavors, each designed for a specific use case.

View File

@ -190,6 +190,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/apache2``
@ -198,6 +202,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-mysql` images come in many flavors, each designed for a specific use case.

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.

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.

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.

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.

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/nginx``
@ -192,6 +196,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-pgsql` images come in many flavors, each designed for a specific use case.

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/nginx``
@ -192,6 +196,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-pgsql` images come in many flavors, each designed for a specific use case.

View File

@ -60,7 +60,7 @@ RUN set -eux && \
rm -rf /var/cache/nginx/ && \
rm -f /etc/php/7.4/fpm/pool.d/www.conf && \
ln -sf /dev/fd/2 /var/log/nginx/error.log && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge curl gpg dirmngr gpg-agent && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*

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/nginx``
@ -192,6 +196,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-pgsql` images come in many flavors, each designed for a specific use case.