From 76edafeb241de2f26665d4f4c96da15c65dfb258 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Thu, 1 Jul 2021 04:25:15 -0400
Subject: [PATCH] Fixed Nginx configuration on Alpine 3.14

---
 web-nginx-mysql/alpine/Dockerfile                | 2 +-
 web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf | 2 +-
 web-nginx-mysql/alpine/docker-entrypoint.sh      | 2 +-
 web-nginx-pgsql/alpine/Dockerfile                | 2 +-
 web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf | 2 +-
 web-nginx-pgsql/alpine/docker-entrypoint.sh      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile
index aa51874df..18c526bb1 100644
--- a/web-nginx-mysql/alpine/Dockerfile
+++ b/web-nginx-mysql/alpine/Dockerfile
@@ -47,7 +47,7 @@ RUN set -eux && \
             php7-openssl \
             supervisor && \
     rm -rf /etc/php7/php-fpm.d/www.conf && \
-    rm -f /etc/nginx/conf.d/*.conf && \
+    rm -f /etc/nginx/http.d/*.conf && \
     ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
     rm -rf /var/cache/apk/*
 
diff --git a/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf b/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf
index 3bed3cf89..770522adf 100644
--- a/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf
+++ b/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf
@@ -67,5 +67,5 @@ http {
     index                           index.php;
     server_tokens                   off;
 
-    include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/http.d/*.conf;
 }
diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh
index 6a638ab15..b53e296e6 100755
--- a/web-nginx-mysql/alpine/docker-entrypoint.sh
+++ b/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -146,7 +146,7 @@ check_db_connect() {
 }
 
 prepare_web_server() {
-    NGINX_CONFD_DIR="/etc/nginx/conf.d"
+    NGINX_CONFD_DIR="/etc/nginx/http.d"
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
 
     echo "** Adding Zabbix virtual host (HTTP)"
diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile
index f6f7d4406..fdced34c4 100644
--- a/web-nginx-pgsql/alpine/Dockerfile
+++ b/web-nginx-pgsql/alpine/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux && \
             postgresql-client \
             supervisor && \
     rm -rf /etc/php7/php-fpm.d/www.conf && \
-    rm -f /etc/nginx/conf.d/*.conf && \
+    rm -f /etc/nginx/http.d/*.conf && \
     ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
     rm -rf /var/cache/apk/*
 
diff --git a/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf b/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf
index 3bed3cf89..770522adf 100644
--- a/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf
+++ b/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf
@@ -67,5 +67,5 @@ http {
     index                           index.php;
     server_tokens                   off;
 
-    include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/http.d/*.conf;
 }
diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh
index 23dbc5321..f19dae20e 100755
--- a/web-nginx-pgsql/alpine/docker-entrypoint.sh
+++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh
@@ -130,7 +130,7 @@ check_db_connect() {
 }
 
 prepare_web_server() {
-    NGINX_CONFD_DIR="/etc/nginx/conf.d"
+    NGINX_CONFD_DIR="/etc/nginx/http.d"
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
 
     echo "** Adding Zabbix virtual host (HTTP)"