From b35ca70fccb9edd7bd1ab9d0885dbac1cd26d728 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 27 Apr 2024 21:21:44 +0900 Subject: [PATCH] Added ZBX_ALLOW_HTTP_AUTH parameter and php-curl package --- Dockerfiles/web-apache-mysql/README.md | 4 ++++ Dockerfiles/web-apache-mysql/alpine/Dockerfile | 1 + .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-mysql/centos/Dockerfile | 1 + .../centos/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-mysql/ol/Dockerfile | 1 + .../web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-mysql/ubuntu/Dockerfile | 1 + .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-pgsql/README.md | 4 ++++ Dockerfiles/web-apache-pgsql/alpine/Dockerfile | 1 + .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-pgsql/centos/Dockerfile | 1 + .../centos/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-pgsql/ol/Dockerfile | 1 + .../web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile | 1 + .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/README.md | 4 ++++ Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 1 + .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/centos/Dockerfile | 1 + .../centos/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/ol/Dockerfile | 1 + .../web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 1 + Dockerfiles/web-nginx-mysql/rhel/README.html | 2 ++ .../web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 1 + .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-pgsql/README.md | 4 ++++ Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 1 + .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 1 + .../centos/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 1 + .../web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 1 + Dockerfiles/web-nginx-pgsql/rhel/README.html | 2 ++ .../web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 1 + .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 ++ Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 3 +++ env_vars/.env_prx | 2 +- env_vars/.env_srv | 2 +- env_vars/.env_web | 1 + 63 files changed, 131 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/web-apache-mysql/README.md b/Dockerfiles/web-apache-mysql/README.md index ab49fa1ea..dfe7b5e83 100644 --- a/Dockerfiles/web-apache-mysql/README.md +++ b/Dockerfiles/web-apache-mysql/README.md @@ -226,6 +226,10 @@ Example of YAML Mapping to Sequences .... ``` +## `ZBX_ALLOW_HTTP_AUTH` + +The variable allows to disable user HTTP authentication. + ### Other variables Additionally the image allows to specify many other environment variables listed below: diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index adc68427b..5e891eaf5 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -39,6 +39,7 @@ RUN set -eux && \ php83-apache2 \ php83-bcmath \ php83-ctype \ + php83-curl \ php83-gd \ php83-gettext \ php83-json \ diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index a0152e21f..d75d9c9b5 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -206,6 +206,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index 9e3e4845a..f4ae1de5e 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -37,6 +37,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mysql \ mod_ssl \ php \ + php-curl \ php-fpm \ php-bcmath \ php-gd \ diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh index 9158c0f7c..0fcb7ee13 100755 --- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh @@ -222,6 +222,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index 4cf906a45..8ea8917f5 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -38,6 +38,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mysql \ mod_ssl \ php \ + php-curl \ php-fpm \ php-bcmath \ php-gd \ diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh index 9158c0f7c..0fcb7ee13 100755 --- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh @@ -222,6 +222,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index 621f6e50a..3f92f0222 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile @@ -42,6 +42,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ locales \ libldap-common \ php8.3-bcmath \ + php8.3-curl \ php8.3-gd \ php8.3-ldap \ php8.3-mbstring \ diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh index 3ed4cf3ca..5a747efad 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -208,6 +208,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-apache-pgsql/README.md b/Dockerfiles/web-apache-pgsql/README.md index 202990870..adf687515 100644 --- a/Dockerfiles/web-apache-pgsql/README.md +++ b/Dockerfiles/web-apache-pgsql/README.md @@ -226,6 +226,10 @@ Example of YAML Mapping to Sequences .... ``` +## `ZBX_ALLOW_HTTP_AUTH` + +The variable allows to disable user HTTP authentication. + ### Other variables Additionally the image allows to specify many other environment variables listed below: diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index e18e210cc..226817191 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -37,6 +37,7 @@ RUN set -eux && \ php83-apache2 \ php83-bcmath \ php83-ctype \ + php83-curl \ php83-gd \ php83-gettext \ php83-json \ diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh index b7113ab5e..8cf4118d4 100755 --- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -193,6 +193,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index a05f78b68..44a3e1097 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -36,6 +36,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ httpd \ mod_ssl \ php \ + php-curl \ php-fpm \ php-bcmath \ php-gd \ diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh index 2debf7f83..139d7f130 100755 --- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index d2c52aea0..df7301d92 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -37,6 +37,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ httpd \ mod_ssl \ php \ + php-curl \ php-fpm \ php-bcmath \ php-gd \ diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh index 2debf7f83..139d7f130 100755 --- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index a4a398973..217c33aaf 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -41,6 +41,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ locales \ libldap-common \ php8.3-bcmath \ + php8.3-curl \ php8.3-gd \ php8.3-ldap \ php8.3-mbstring \ diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 3438e064c..aa253a496 100755 --- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -199,6 +199,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-nginx-mysql/README.md b/Dockerfiles/web-nginx-mysql/README.md index 7e72a6839..7888081bb 100644 --- a/Dockerfiles/web-nginx-mysql/README.md +++ b/Dockerfiles/web-nginx-mysql/README.md @@ -227,6 +227,10 @@ Example of YAML Mapping to Sequences .... ``` +## `ZBX_ALLOW_HTTP_AUTH` + +The variable allows to disable user HTTP authentication. + ### Other variables Additionally the image allows to specify many other environment variables listed below: diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 807a01687..56b7eeabe 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -38,6 +38,7 @@ RUN set -eux && \ nginx \ php83-bcmath \ php83-ctype \ + php83-curl \ php83-fpm \ php83-gd \ php83-gettext \ diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index 25972ed7a..1969bdb72 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -228,6 +228,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index 486aa7959..4ca8af3ca 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -36,6 +36,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mysql \ nginx \ php-bcmath \ + php-curl \ php-fpm \ php-gd \ php-ldap \ diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index 5912feb4f..39f99e154 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -228,6 +228,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index d76b2c40a..c7b41157f 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -37,6 +37,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mysql \ nginx \ php-bcmath \ + php-curl \ php-fpm \ php-gd \ php-ldap \ diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php index 02dcf3908..697acbf9b 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -103,3 +103,5 @@ else { $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS')); $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array(); + +$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false; diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index 5912feb4f..39f99e154 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -228,6 +228,9 @@ prepare_zbx_web_config() { export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} + : ${ZBX_ALLOW_HTTP_AUTH:="true"} + export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH} + if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php" diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index cde237e7f..aca47fe54 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -60,6 +60,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mysql \ nginx \ php-bcmath \ + php-curl \ php-fpm \ php-gd \ php-json \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/README.html b/Dockerfiles/web-nginx-mysql/rhel/README.html index 3dd2beb4b..08e64bf9a 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/README.html +++ b/Dockerfiles/web-nginx-mysql/rhel/README.html @@ -113,6 +113,8 @@ podman run --name some-zabbix-web-nginx-mysql -e DB_ ZBX_SSO_SETTINGS: "{'baseurl': 'https://zabbix-docker.mydomain.com', 'use_proxy_headers': true, 'strict': false}" .... .... +

ZBX_ALLOW_HTTP_AUTH

+

The variable allows to disable user HTTP authentication.

Other variables

Additionally the image allows to specify many other environment variables listed below:

ZBX_VAULTDBPATH= # Available since 5.2.0
diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php
index 02dcf3908..697acbf9b 100644
--- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php
+++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php
@@ -103,3 +103,5 @@ else {
 
 $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS'));
 $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array();
+
+$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false;
diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
index 8e471b6be..f04e5c8c9 100755
--- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
@@ -228,6 +228,9 @@ prepare_zbx_web_config() {
     export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT}
     export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT}
 
+    : ${ZBX_ALLOW_HTTP_AUTH:="true"}
+    export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH}
+
     if [ -n "${ZBX_SESSION_NAME}" ]; then
         cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp"
         sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php"
diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile
index a794a3dca..bc1761ae7 100644
--- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile
@@ -41,6 +41,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             locales \
             libldap-common \
             php8.3-bcmath \
+            php8.3-curl \
             php8.3-fpm \
             php8.3-gd \
             php8.3-ldap \
diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
index 02dcf3908..697acbf9b 100644
--- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
@@ -103,3 +103,5 @@ else {
 
 $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS'));
 $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array();
+
+$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false;
diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
index e5e682648..8bf971118 100755
--- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -228,6 +228,9 @@ prepare_zbx_web_config() {
     export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT}
     export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT}
 
+    : ${ZBX_ALLOW_HTTP_AUTH:="true"}
+    export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH}
+
     if [ -n "${ZBX_SESSION_NAME}" ]; then
         cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp"
         sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php"
diff --git a/Dockerfiles/web-nginx-pgsql/README.md b/Dockerfiles/web-nginx-pgsql/README.md
index 536333fe4..36d368aca 100644
--- a/Dockerfiles/web-nginx-pgsql/README.md
+++ b/Dockerfiles/web-nginx-pgsql/README.md
@@ -226,6 +226,10 @@ Example of YAML Mapping to Sequences
 ....
 ```
 
+## `ZBX_ALLOW_HTTP_AUTH`
+
+The variable allows to disable user HTTP authentication.
+
 ### Other variables
 
 Additionally the image allows to specify many other environment variables listed below:
diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile
index 02a8ccc6e..06bbed68e 100644
--- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile
@@ -36,6 +36,7 @@ RUN set -eux && \
             nginx \
             php83-bcmath \
             php83-ctype \
+            php83-curl \
             php83-fpm \
             php83-gd \
             php83-gettext \
diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php
index 02dcf3908..697acbf9b 100644
--- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php
+++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php
@@ -103,3 +103,5 @@ else {
 
 $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS'));
 $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array();
+
+$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false;
diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
index 5754a7641..3bb4fc38b 100755
--- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
@@ -215,6 +215,9 @@ prepare_zbx_web_config() {
     export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT}
     export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT}
 
+    : ${ZBX_ALLOW_HTTP_AUTH:="true"}
+    export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH}
+
     if [ -n "${ZBX_SESSION_NAME}" ]; then
         cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp"
         sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php"
diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile
index 38e6d625f..e0905931c 100644
--- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile
@@ -37,6 +37,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             glibc-locale-source \
             nginx \
             php-bcmath \
+            php-curl \
             php-fpm \
             php-gd \
             php-json \
diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php
index 02dcf3908..697acbf9b 100644
--- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php
+++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php
@@ -103,3 +103,5 @@ else {
 
 $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS'));
 $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array();
+
+$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false;
diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
index 49e64ccf3..3cb3a9990 100755
--- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
@@ -215,6 +215,9 @@ prepare_zbx_web_config() {
     export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT}
     export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT}
 
+    : ${ZBX_ALLOW_HTTP_AUTH:="true"}
+    export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH}
+
     if [ -n "${ZBX_SESSION_NAME}" ]; then
         cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp"
         sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php"
diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
index bcf131d3d..c38519a32 100644
--- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
@@ -38,6 +38,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             glibc-locale-source \
             nginx \
             php-bcmath \
+            php-curl \
             php-fpm \
             php-gd \
             php-json \
diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php
index 02dcf3908..697acbf9b 100644
--- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php
+++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php
@@ -103,3 +103,5 @@ else {
 
 $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS'));
 $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array();
+
+$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false;
diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
index 49e64ccf3..3cb3a9990 100755
--- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
@@ -215,6 +215,9 @@ prepare_zbx_web_config() {
     export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT}
     export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT}
 
+    : ${ZBX_ALLOW_HTTP_AUTH:="true"}
+    export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH}
+
     if [ -n "${ZBX_SESSION_NAME}" ]; then
         cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp"
         sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php"
diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
index 55fe21bc7..4daec6a0b 100644
--- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
@@ -60,6 +60,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             nginx \
             postgresql \
             php-bcmath \
+            php-curl \
             php-fpm \
             php-gd \
             php-json \
diff --git a/Dockerfiles/web-nginx-pgsql/rhel/README.html b/Dockerfiles/web-nginx-pgsql/rhel/README.html
index c236cfff8..42edfa018 100644
--- a/Dockerfiles/web-nginx-pgsql/rhel/README.html
+++ b/Dockerfiles/web-nginx-pgsql/rhel/README.html
@@ -113,6 +113,8 @@ podman run --name some-zabbix-web-nginx-pgsql -e DB_
     ZBX_SSO_SETTINGS: "{'baseurl': 'https://zabbix-docker.mydomain.com', 'use_proxy_headers': true, 'strict': false}"
     ....
 ....
+

ZBX_ALLOW_HTTP_AUTH

+

The variable allows to disable user HTTP authentication.

Other variables

Additionally the image allows to specify many other environment variables listed below:

ZBX_VAULTDBPATH= # Available since 5.2.0
diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php
index 02dcf3908..697acbf9b 100644
--- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php
+++ b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php
@@ -103,3 +103,5 @@ else {
 
 $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS'));
 $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array();
+
+$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false;
diff --git a/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh
index 49e64ccf3..3cb3a9990 100755
--- a/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh
@@ -215,6 +215,9 @@ prepare_zbx_web_config() {
     export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT}
     export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT}
 
+    : ${ZBX_ALLOW_HTTP_AUTH:="true"}
+    export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH}
+
     if [ -n "${ZBX_SESSION_NAME}" ]; then
         cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp"
         sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php"
diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile
index 754680b39..5726d93d0 100644
--- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile
@@ -40,6 +40,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             locales \
             libldap-common \
             php8.3-bcmath \
+            php8.3-curl \
             php8.3-fpm \
             php8.3-gd \
             php8.3-ldap \
diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
index 02dcf3908..697acbf9b 100644
--- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
+++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
@@ -103,3 +103,5 @@ else {
 
 $sso_settings = str_replace("'","\"",getenv('ZBX_SSO_SETTINGS'));
 $SSO['SETTINGS'] = (json_decode($sso_settings)) ? json_decode($sso_settings, true) : array();
+
+$ALLOW_HTTP_AUTH = getenv('ZBX_ALLOW_HTTP_AUTH') == 'true' ? true: false;
diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
index eeea0012b..9a5428600 100755
--- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
@@ -215,6 +215,9 @@ prepare_zbx_web_config() {
     export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT}
     export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT}
 
+    : ${ZBX_ALLOW_HTTP_AUTH:="true"}
+    export ZBX_ALLOW_HTTP_AUTH=${ZBX_ALLOW_HTTP_AUTH}
+
     if [ -n "${ZBX_SESSION_NAME}" ]; then
         cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp"
         sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "/tmp/defines.inc.php_tmp" > "$ZABBIX_WWW_ROOT/include/defines.inc.php"
diff --git a/env_vars/.env_prx b/env_vars/.env_prx
index ef017eab6..cb8d52cf8 100644
--- a/env_vars/.env_prx
+++ b/env_vars/.env_prx
@@ -31,7 +31,7 @@
 # ZBX_STARTPOLLERSUNREACHABLE=1
 # ZBX_STARTTRAPPERS=5
 # ZBX_STARTPINGERS=1
-# ZBX_STARTDISCOVERERS=1
+# ZBX_STARTDISCOVERERS=5
 # ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
 # ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0
 # ZBX_STARTHTTPPOLLERS=1
diff --git a/env_vars/.env_srv b/env_vars/.env_srv
index 028dfa78d..098b0e1a0 100644
--- a/env_vars/.env_srv
+++ b/env_vars/.env_srv
@@ -25,7 +25,7 @@
 # ZBX_STARTPOLLERSUNREACHABLE=1
 # ZBX_STARTTRAPPERS=5
 # ZBX_STARTPINGERS=1
-# ZBX_STARTDISCOVERERS=1
+# ZBX_STARTDISCOVERERS=5
 # ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
 # ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0
 # ZBX_STARTHTTPPOLLERS=1
diff --git a/env_vars/.env_web b/env_vars/.env_web
index 8f6585ad0..41ce89b68 100644
--- a/env_vars/.env_web
+++ b/env_vars/.env_web
@@ -17,6 +17,7 @@ ZBX_SERVER_NAME=Composed installation
 # ZBX_HISTORYSTORAGEURL=http://elasticsearch:9200/ # Available since 3.4.5
 # ZBX_HISTORYSTORAGETYPES=['uint', 'dbl', 'str', 'text', 'log'] # Available since 3.4.5
 # ZBX_SSO_SETTINGS=[] # Available since 5.0.0
+# ZBX_ALLOW_HTTP_AUTH=true # Available since 7.0.0
 # ENABLE_WEB_ACCESS_LOG=true
 # ZBX_MAXEXECUTIONTIME=600
 # ZBX_MEMORYLIMIT=128M