From 42450b9f49f9e0dff7afab617f93e67804f09633 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 12 Feb 2025 13:51:08 +0900 Subject: [PATCH] Fixed missing prepare_zbx_config function for some Nginx images --- Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh | 8 ++++++++ Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh | 8 ++++++++ Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index 77591e6f9..ce300b174 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -330,6 +330,14 @@ prepare_zbx_php_config() { "$NGINX_CONF_FILE" } +prepare_zbx_config() { + 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" + rm -f "/tmp/defines.inc.php_tmp" + fi +} + ################################################# echo "** Deploying Zabbix web-interface (Nginx) with PostgreSQL database" diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index 77591e6f9..ce300b174 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -330,6 +330,14 @@ prepare_zbx_php_config() { "$NGINX_CONF_FILE" } +prepare_zbx_config() { + 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" + rm -f "/tmp/defines.inc.php_tmp" + fi +} + ################################################# echo "** Deploying Zabbix web-interface (Nginx) with PostgreSQL database" diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index fa831f9d8..fc17031da 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -330,6 +330,14 @@ prepare_zbx_php_config() { "$NGINX_CONF_FILE" } +prepare_zbx_config() { + 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" + rm -f "/tmp/defines.inc.php_tmp" + fi +} + ################################################# echo "** Deploying Zabbix web-interface (Nginx) with PostgreSQL database"