diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index a6cc61937..da37c5fac 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -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() { diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index a2801706c..3d17adb1c 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -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() { diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index a2801706c..3d17adb1c 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -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() { diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh index a2801706c..3d17adb1c 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -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() { diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index c211e776e..7348a2549 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -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() { diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index b98e5eb70..b0f981d97 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -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() { diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index e4ef70c4e..e87ad4cac 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -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() { diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index e4ef70c4e..e87ad4cac 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -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() { diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index d48598617..56b1436f5 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -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() {