From 9602d3c0989e466ec6fb3aade54215ea13b84634 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 20 Jul 2022 21:53:46 +0300 Subject: [PATCH] Fixed IPv6 listen for Nginx based images --- Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh | 5 +++++ Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh | 5 +++++ Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh | 5 +++++ Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh | 5 +++++ Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh | 5 +++++ Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh | 5 +++++ Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh | 5 +++++ Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh | 5 +++++ Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 5 +++++ 9 files changed, 45 insertions(+) diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index e78eec52b..8790332f8 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -121,6 +121,11 @@ prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/http.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" + if [ ! -f "/proc/net/if_inet6" ]; then + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx.conf" + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR/nginx.conf" diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index 5d0c7e1db..0b1b6420a 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -121,6 +121,11 @@ prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" + if [ ! -f "/proc/net/if_inet6" ]; then + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx.conf" + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR/nginx.conf" diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index 5d0c7e1db..0b1b6420a 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -121,6 +121,11 @@ prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" + if [ ! -f "/proc/net/if_inet6" ]; then + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx.conf" + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR/nginx.conf" diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh index cb7303711..4e379215f 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -121,6 +121,11 @@ prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" + if [ ! -f "/proc/net/if_inet6" ]; then + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx.conf" + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR" diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 1fb592426..32bd1a225 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -121,6 +121,11 @@ prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" + if [ ! -f "/proc/net/if_inet6" ]; then + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx.conf" + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR/nginx.conf" diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index 1b1fdc47a..e8bae251c 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -121,6 +121,11 @@ prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/http.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" + if [ ! -f "/proc/net/if_inet6" ]; then + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx.conf" + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR/nginx.conf" diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index 9185bcaff..f9b620a95 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -121,6 +121,11 @@ prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" + if [ ! -f "/proc/net/if_inet6" ]; then + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx.conf" + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR/nginx.conf" diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index 9185bcaff..f9b620a95 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -121,6 +121,11 @@ prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" + if [ ! -f "/proc/net/if_inet6" ]; then + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx.conf" + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR/nginx.conf" diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 8304fe236..593cb3158 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -121,6 +121,11 @@ prepare_web_server() { NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_SSL_CONFIG="/etc/ssl/nginx" + if [ ! -f "/proc/net/if_inet6" ]; then + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx.conf" + sed -i '/listen \[::\]/d' "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR/nginx.conf"