From 91d14226b87159bbd7fe8d5bd8a4373d7b12639a Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 11 Sep 2020 03:14:11 -0400 Subject: [PATCH 1/2] Documentation about ZBX_SSO_SETTINGS and /etc/zabbix/web/certs --- web-apache-mysql/alpine/README.md | 8 ++++++++ web-apache-mysql/centos/README.md | 8 ++++++++ web-apache-mysql/ubuntu/README.md | 8 ++++++++ web-apache-pgsql/alpine/README.md | 8 ++++++++ web-apache-pgsql/centos/README.md | 8 ++++++++ web-apache-pgsql/ubuntu/README.md | 8 ++++++++ web-nginx-mysql/alpine/README.md | 8 ++++++++ web-nginx-mysql/centos/README.md | 8 ++++++++ web-nginx-mysql/ubuntu/README.md | 8 ++++++++ web-nginx-pgsql/alpine/README.md | 8 ++++++++ web-nginx-pgsql/centos/README.md | 8 ++++++++ web-nginx-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/ubuntu/README.md | 8 ++++++++ 13 files changed, 97 insertions(+), 1 deletion(-) diff --git a/web-apache-mysql/alpine/README.md b/web-apache-mysql/alpine/README.md index 6429bd35a..762097c76 100644 --- a/web-apache-mysql/alpine/README.md +++ b/web-apache-mysql/alpine/README.md @@ -186,6 +186,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`` @@ -194,6 +198,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. diff --git a/web-apache-mysql/centos/README.md b/web-apache-mysql/centos/README.md index 6429bd35a..762097c76 100644 --- a/web-apache-mysql/centos/README.md +++ b/web-apache-mysql/centos/README.md @@ -186,6 +186,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`` @@ -194,6 +198,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. diff --git a/web-apache-mysql/ubuntu/README.md b/web-apache-mysql/ubuntu/README.md index 6429bd35a..762097c76 100644 --- a/web-apache-mysql/ubuntu/README.md +++ b/web-apache-mysql/ubuntu/README.md @@ -186,6 +186,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`` @@ -194,6 +198,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. diff --git a/web-apache-pgsql/alpine/README.md b/web-apache-pgsql/alpine/README.md index 9e37927f4..fcd67454a 100644 --- a/web-apache-pgsql/alpine/README.md +++ b/web-apache-pgsql/alpine/README.md @@ -180,6 +180,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`` @@ -188,6 +192,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. diff --git a/web-apache-pgsql/centos/README.md b/web-apache-pgsql/centos/README.md index 9e37927f4..fcd67454a 100644 --- a/web-apache-pgsql/centos/README.md +++ b/web-apache-pgsql/centos/README.md @@ -180,6 +180,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`` @@ -188,6 +192,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. diff --git a/web-apache-pgsql/ubuntu/README.md b/web-apache-pgsql/ubuntu/README.md index 9e37927f4..fcd67454a 100644 --- a/web-apache-pgsql/ubuntu/README.md +++ b/web-apache-pgsql/ubuntu/README.md @@ -180,6 +180,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`` @@ -188,6 +192,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. diff --git a/web-nginx-mysql/alpine/README.md b/web-nginx-mysql/alpine/README.md index 8f404c324..5d3d2328f 100644 --- a/web-nginx-mysql/alpine/README.md +++ b/web-nginx-mysql/alpine/README.md @@ -187,6 +187,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`` @@ -195,6 +199,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. diff --git a/web-nginx-mysql/centos/README.md b/web-nginx-mysql/centos/README.md index 8f404c324..5d3d2328f 100644 --- a/web-nginx-mysql/centos/README.md +++ b/web-nginx-mysql/centos/README.md @@ -187,6 +187,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`` @@ -195,6 +199,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. diff --git a/web-nginx-mysql/ubuntu/README.md b/web-nginx-mysql/ubuntu/README.md index 8f404c324..5d3d2328f 100644 --- a/web-nginx-mysql/ubuntu/README.md +++ b/web-nginx-mysql/ubuntu/README.md @@ -187,6 +187,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`` @@ -195,6 +199,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. diff --git a/web-nginx-pgsql/alpine/README.md b/web-nginx-pgsql/alpine/README.md index 4be7546c1..7a133cc2e 100644 --- a/web-nginx-pgsql/alpine/README.md +++ b/web-nginx-pgsql/alpine/README.md @@ -180,6 +180,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`` @@ -188,6 +192,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. diff --git a/web-nginx-pgsql/centos/README.md b/web-nginx-pgsql/centos/README.md index 4be7546c1..7a133cc2e 100644 --- a/web-nginx-pgsql/centos/README.md +++ b/web-nginx-pgsql/centos/README.md @@ -180,6 +180,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`` @@ -188,6 +192,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. diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 9cc518d5a..a4fd8387c 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -59,7 +59,7 @@ RUN set -eux && \ rm -rf /var/cache/nginx/ && \ rm -f /etc/php/7.2/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/* diff --git a/web-nginx-pgsql/ubuntu/README.md b/web-nginx-pgsql/ubuntu/README.md index 4be7546c1..7a133cc2e 100644 --- a/web-nginx-pgsql/ubuntu/README.md +++ b/web-nginx-pgsql/ubuntu/README.md @@ -180,6 +180,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`` @@ -188,6 +192,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. From 434dcc7866dd29cd18cf55bf0f3e418eb1b5a473 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 11 Sep 2020 03:17:37 -0400 Subject: [PATCH 2/2] Added badge to control github actions --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 60b341d7b..f5454ca6f 100644 --- a/README.md +++ b/README.md @@ -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.