From 915314340f923e6a42a2c4730cf134fa3b484ece Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 5 Feb 2024 01:24:40 +0900
Subject: [PATCH] Fixed index file name for Apache images

---
 Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh     | 2 +-
 Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh | 2 +-
 Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh     | 2 +-
 Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
index 07d4329b7..eb5752fbf 100755
--- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
@@ -218,7 +218,7 @@ prepare_zbx_web_config() {
     if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
         sed -i \
             -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \
-        "$ZABBIX_ETC_DIR/apache_ssl.conff"
+        "$ZABBIX_ETC_DIR/apache_ssl.conf"
     fi
 
     : ${ENABLE_WEB_ACCESS_LOG:="true"}
diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
index e3b589b86..31ebc46f7 100755
--- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
@@ -234,7 +234,7 @@ prepare_zbx_web_config() {
     if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
         sed -i \
             -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \
-        "$ZABBIX_ETC_DIR/apache_ssl.conff"
+        "$ZABBIX_ETC_DIR/apache_ssl.conf"
     fi
 
     : ${ENABLE_WEB_ACCESS_LOG:="true"}
diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
index e3b589b86..31ebc46f7 100755
--- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
@@ -234,7 +234,7 @@ prepare_zbx_web_config() {
     if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
         sed -i \
             -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \
-        "$ZABBIX_ETC_DIR/apache_ssl.conff"
+        "$ZABBIX_ETC_DIR/apache_ssl.conf"
     fi
 
     : ${ENABLE_WEB_ACCESS_LOG:="true"}
diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
index f86b4d4b5..ac22f53ae 100755
--- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
@@ -218,7 +218,7 @@ prepare_zbx_web_config() {
     if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
         sed -i \
             -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \
-        "$ZABBIX_ETC_DIR/apache_ssl.conff"
+        "$ZABBIX_ETC_DIR/apache_ssl.conf"
     fi
 
     : ${ENABLE_WEB_ACCESS_LOG:="true"}
diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
index e50dd3995..34a252855 100755
--- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
@@ -205,7 +205,7 @@ prepare_zbx_web_config() {
     if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
         sed -i \
             -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \
-        "$ZABBIX_ETC_DIR/apache_ssl.conff"
+        "$ZABBIX_ETC_DIR/apache_ssl.conf"
     fi
 
     : ${ENABLE_WEB_ACCESS_LOG:="true"}
diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
index 8534c7a7e..ff5e7936e 100755
--- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
@@ -221,7 +221,7 @@ prepare_zbx_web_config() {
     if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
         sed -i \
             -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \
-        "$ZABBIX_ETC_DIR/apache_ssl.conff"
+        "$ZABBIX_ETC_DIR/apache_ssl.conf"
     fi
 
     : ${ENABLE_WEB_ACCESS_LOG:="true"}
diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh
index 8534c7a7e..ff5e7936e 100755
--- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh
@@ -221,7 +221,7 @@ prepare_zbx_web_config() {
     if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
         sed -i \
             -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \
-        "$ZABBIX_ETC_DIR/apache_ssl.conff"
+        "$ZABBIX_ETC_DIR/apache_ssl.conf"
     fi
 
     : ${ENABLE_WEB_ACCESS_LOG:="true"}
diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
index e07918c7d..ef4932a94 100755
--- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
@@ -209,7 +209,7 @@ prepare_zbx_web_config() {
     if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
         sed -i \
             -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \
-        "$ZABBIX_ETC_DIR/apache_ssl.conff"
+        "$ZABBIX_ETC_DIR/apache_ssl.conf"
     fi
 
     : ${ENABLE_WEB_ACCESS_LOG:="true"}