From e1b49acf89cfececa9107f9d981d36cbca218c96 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 24 Oct 2022 14:37:30 +0200
Subject: [PATCH] [bitnami/nginx] Release 1.23.2-debian-11-r2 (#11187)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/nginx/1.23/debian-11/Dockerfile                       | 4 ++--
 .../debian-11/prebuildfs/opt/bitnami/.bitnami_components.json | 4 ++--
 .../1.23/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bitnami/nginx/1.23/debian-11/Dockerfile b/bitnami/nginx/1.23/debian-11/Dockerfile
index 1f1e86f28ce0..ca2ded19504b 100644
--- a/bitnami/nginx/1.23/debian-11/Dockerfile
+++ b/bitnami/nginx/1.23/debian-11/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="1.23.2-debian-11-r1" \
+      org.opencontainers.image.ref.name="1.23.2-debian-11-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -22,7 +22,7 @@ RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "render-template-1.0.3-154-linux-${OS_ARCH}-debian-11" \
-      "nginx-1.23.2-0-linux-${OS_ARCH}-debian-11" \
+      "nginx-1.23.2-1-linux-${OS_ARCH}-debian-11" \
       "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/nginx/1.23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index f19af4eb3025..9999ddf69eb9 100644
--- a/bitnami/nginx/1.23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/nginx/1.23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -8,10 +8,10 @@
     },
     "nginx": {
         "arch": "amd64",
-        "digest": "234ea65b35b51d7a486578ddf1d49ecbda4fbd71ad09f531d8368ce2c45f4e97",
+        "digest": "8643036fdd3909a1f96fc8d2d09fa936c5c77cdb0ff424223f856b7a75c5e924",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.23.2-0"
+        "version": "1.23.2-1"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh b/bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
index 5a1825705ff4..c4239c164771 100755
--- a/bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
+++ b/bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
@@ -31,7 +31,7 @@ nginx_custom_init_scripts
 ! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)"
 
 # Configure HTTPS port number
-if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]]; then
+if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] && is_dir_empty "${NGINX_SERVER_BLOCKS_DIR}"; then
     cp "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
 fi