From 8a9be1e1a0bb9c48b03c1f815606ffa3097d5bc5 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Fri, 5 Dec 2025 17:48:02 +0900
Subject: [PATCH] Merge pull request #1778 from petrkle/7.4

Enable cidr in WEB_REAL_IP_FROM
---
 Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh | 4 ++--
 Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh | 4 ++--
 Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh     | 4 ++--
 Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh   | 4 ++--
 Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh | 4 ++--
 Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh | 4 ++--
 Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh | 4 ++--
 Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh     | 4 ++--
 Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh   | 4 ++--
 Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
index 0d346631d..1d5fd3df0 100755
--- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -223,11 +223,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \
diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
index cedca3932..bba717473 100755
--- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
@@ -223,11 +223,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \
diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
index cedca3932..bba717473 100755
--- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
@@ -223,11 +223,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \
diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
index cedca3932..bba717473 100755
--- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
@@ -223,11 +223,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \
diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
index d04113b8e..9ccd3a608 100755
--- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -223,11 +223,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \
diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
index 723c9ad80..4969a937d 100755
--- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
@@ -225,11 +225,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \
diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
index af40eb0a9..75eee1af1 100755
--- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
@@ -225,11 +225,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \
diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
index af40eb0a9..75eee1af1 100755
--- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
@@ -225,11 +225,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \
diff --git a/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh
index 41925fb1f..0aca2bc89 100755
--- a/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh
@@ -225,11 +225,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \
diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
index bd7fd4749..afafc1dca 100755
--- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
@@ -225,11 +225,11 @@ prepare_web_server() {
     WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx.conf"
 
     sed -i \
-        -e "s/{WEB_REAL_IP_FROM}/${WEB_REAL_IP_FROM}/g" \
+        -e "s#{WEB_REAL_IP_FROM}#${WEB_REAL_IP_FROM}#g" \
     "$ZABBIX_CONF_DIR/nginx_ssl.conf"
 
     sed -i \