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
parent 4c4e84d7cd
commit bbf4a62a20
9 changed files with 216 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,6 +207,30 @@ prepare_web_server() {
sed -i \
-e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \
"$NGINX_CONF_FILE"
<<<<<<< HEAD
=======
[ ! -z "${WEB_REAL_IP_FROM}" ] && WEB_REAL_IP_FROM="set_real_ip_from ${WEB_REAL_IP_FROM};"
WEB_REAL_IP_FROM=$(escape_spec_char "$WEB_REAL_IP_FROM")
[ ! -z "${WEB_REAL_IP_HEADER}" ] && WEB_REAL_IP_HEADER="real_ip_header ${WEB_REAL_IP_HEADER};"
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \
-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" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
>>>>>>> 8a11aefbb (Merge pull request #1778 from petrkle/7.4)
}
prepare_zbx_php_config() {

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

@ -207,6 +207,30 @@ prepare_web_server() {
sed -i \
-e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \
"$NGINX_CONF_FILE"
<<<<<<< HEAD
=======
[ ! -z "${WEB_REAL_IP_FROM}" ] && WEB_REAL_IP_FROM="set_real_ip_from ${WEB_REAL_IP_FROM};"
WEB_REAL_IP_FROM=$(escape_spec_char "$WEB_REAL_IP_FROM")
[ ! -z "${WEB_REAL_IP_HEADER}" ] && WEB_REAL_IP_HEADER="real_ip_header ${WEB_REAL_IP_HEADER};"
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \
-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" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
>>>>>>> 8a11aefbb (Merge pull request #1778 from petrkle/7.4)
}
prepare_zbx_php_config() {

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

@ -207,6 +207,30 @@ prepare_web_server() {
sed -i \
-e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \
"$NGINX_CONF_FILE"
<<<<<<< HEAD
=======
[ ! -z "${WEB_REAL_IP_FROM}" ] && WEB_REAL_IP_FROM="set_real_ip_from ${WEB_REAL_IP_FROM};"
WEB_REAL_IP_FROM=$(escape_spec_char "$WEB_REAL_IP_FROM")
[ ! -z "${WEB_REAL_IP_HEADER}" ] && WEB_REAL_IP_HEADER="real_ip_header ${WEB_REAL_IP_HEADER};"
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \
-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" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
>>>>>>> 8a11aefbb (Merge pull request #1778 from petrkle/7.4)
}
prepare_zbx_php_config() {

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

@ -207,6 +207,30 @@ prepare_web_server() {
sed -i \
-e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \
"$NGINX_CONF_FILE"
<<<<<<< HEAD
=======
[ ! -z "${WEB_REAL_IP_FROM}" ] && WEB_REAL_IP_FROM="set_real_ip_from ${WEB_REAL_IP_FROM};"
WEB_REAL_IP_FROM=$(escape_spec_char "$WEB_REAL_IP_FROM")
[ ! -z "${WEB_REAL_IP_HEADER}" ] && WEB_REAL_IP_HEADER="real_ip_header ${WEB_REAL_IP_HEADER};"
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \
-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" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
>>>>>>> 8a11aefbb (Merge pull request #1778 from petrkle/7.4)
}
prepare_zbx_php_config() {

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

@ -207,6 +207,30 @@ prepare_web_server() {
sed -i \
-e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \
"$NGINX_CONF_FILE"
<<<<<<< HEAD
=======
[ ! -z "${WEB_REAL_IP_FROM}" ] && WEB_REAL_IP_FROM="set_real_ip_from ${WEB_REAL_IP_FROM};"
WEB_REAL_IP_FROM=$(escape_spec_char "$WEB_REAL_IP_FROM")
[ ! -z "${WEB_REAL_IP_HEADER}" ] && WEB_REAL_IP_HEADER="real_ip_header ${WEB_REAL_IP_HEADER};"
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \
-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" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
>>>>>>> 8a11aefbb (Merge pull request #1778 from petrkle/7.4)
}
prepare_zbx_php_config() {

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

@ -209,6 +209,30 @@ prepare_web_server() {
sed -i \
-e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \
"$NGINX_CONF_FILE"
<<<<<<< HEAD
=======
[ ! -z "${WEB_REAL_IP_FROM}" ] && WEB_REAL_IP_FROM="set_real_ip_from ${WEB_REAL_IP_FROM};"
WEB_REAL_IP_FROM=$(escape_spec_char "$WEB_REAL_IP_FROM")
[ ! -z "${WEB_REAL_IP_HEADER}" ] && WEB_REAL_IP_HEADER="real_ip_header ${WEB_REAL_IP_HEADER};"
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \
-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" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
>>>>>>> 8a11aefbb (Merge pull request #1778 from petrkle/7.4)
}
prepare_zbx_php_config() {

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

@ -209,6 +209,30 @@ prepare_web_server() {
sed -i \
-e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \
"$NGINX_CONF_FILE"
<<<<<<< HEAD
=======
[ ! -z "${WEB_REAL_IP_FROM}" ] && WEB_REAL_IP_FROM="set_real_ip_from ${WEB_REAL_IP_FROM};"
WEB_REAL_IP_FROM=$(escape_spec_char "$WEB_REAL_IP_FROM")
[ ! -z "${WEB_REAL_IP_HEADER}" ] && WEB_REAL_IP_HEADER="real_ip_header ${WEB_REAL_IP_HEADER};"
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \
-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" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
>>>>>>> 8a11aefbb (Merge pull request #1778 from petrkle/7.4)
}
prepare_zbx_php_config() {

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

@ -209,6 +209,30 @@ prepare_web_server() {
sed -i \
-e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \
"$NGINX_CONF_FILE"
<<<<<<< HEAD
=======
[ ! -z "${WEB_REAL_IP_FROM}" ] && WEB_REAL_IP_FROM="set_real_ip_from ${WEB_REAL_IP_FROM};"
WEB_REAL_IP_FROM=$(escape_spec_char "$WEB_REAL_IP_FROM")
[ ! -z "${WEB_REAL_IP_HEADER}" ] && WEB_REAL_IP_HEADER="real_ip_header ${WEB_REAL_IP_HEADER};"
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \
-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" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
>>>>>>> 8a11aefbb (Merge pull request #1778 from petrkle/7.4)
}
prepare_zbx_php_config() {

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

@ -209,6 +209,30 @@ prepare_web_server() {
sed -i \
-e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \
"$NGINX_CONF_FILE"
<<<<<<< HEAD
=======
[ ! -z "${WEB_REAL_IP_FROM}" ] && WEB_REAL_IP_FROM="set_real_ip_from ${WEB_REAL_IP_FROM};"
WEB_REAL_IP_FROM=$(escape_spec_char "$WEB_REAL_IP_FROM")
[ ! -z "${WEB_REAL_IP_HEADER}" ] && WEB_REAL_IP_HEADER="real_ip_header ${WEB_REAL_IP_HEADER};"
WEB_REAL_IP_HEADER=$(escape_spec_char "$WEB_REAL_IP_HEADER")
sed -i \
-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" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx.conf"
sed -i \
-e "s/{WEB_REAL_IP_HEADER}/${WEB_REAL_IP_HEADER}/g" \
"$ZABBIX_CONF_DIR/nginx_ssl.conf"
>>>>>>> 8a11aefbb (Merge pull request #1778 from petrkle/7.4)
}
prepare_zbx_php_config() {