Andrey/zabbix-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1778 from petrkle/7.4

Browse Source 
Enable cidr in WEB_REAL_IP_FROM
This commit is contained in:
Alexey Pustovalov 2025-12-05 17:48:02 +09:00 committed by GitHub
commit 2043ea4f18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -242,11 +242,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \

4
Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -242,11 +242,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \

4
Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
View File

@ -242,11 +242,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \

4
Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
View File

@ -242,11 +242,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \

4
Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -242,11 +242,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \

4
Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -244,11 +244,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \

4
Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -244,11 +244,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \

4
Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
View File

@ -244,11 +244,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \

4
Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh
View File

@ -244,11 +244,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \

4
Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -244,11 +244,11 @@ prepare_web_server() {
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER") WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx.conf"
sed -i \ 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" "$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \ sed -i \