From 46bdfbd48474d5f9c59196cfa46bf2602b61ecf3 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 23 Feb 2023 21:33:02 +0100
Subject: [PATCH] [bitnami/drupal-nginx] Release 9.5.3-debian-11-r9 (#25096)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/drupal-nginx/9/debian-11/Dockerfile                   | 4 ++--
 .../default-https-server-block.conf                           | 0
 .../debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh  | 2 +-
 .../9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/{server_blocks => bitnami-templates}/default-https-server-block.conf (100%)

diff --git a/bitnami/drupal-nginx/9/debian-11/Dockerfile b/bitnami/drupal-nginx/9/debian-11/Dockerfile
index 0a3eb3918056..6a010115bee8 100644
--- a/bitnami/drupal-nginx/9/debian-11/Dockerfile
+++ b/bitnami/drupal-nginx/9/debian-11/Dockerfile
@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-02-22T14:24:22Z" \
+      org.opencontainers.image.created="2023-02-23T17:47:01Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.5.3-debian-11-r8" \
+      org.opencontainers.image.ref.name="9.5.3-debian-11-r9" \
       org.opencontainers.image.title="drupal-nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.5.3"
diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/server_blocks/default-https-server-block.conf b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/default-https-server-block.conf
similarity index 100%
rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/server_blocks/default-https-server-block.conf
rename to bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/default-https-server-block.conf
diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh
index 0851efcbb934..c1862dbbea1b 100755
--- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh
+++ b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh
@@ -47,7 +47,7 @@ nginx_patch_httpoxy_vulnerability
 # Configure default HTTP port
 nginx_configure_port "$NGINX_DEFAULT_HTTP_PORT_NUMBER"
 # Configure default HTTPS port
-nginx_configure_port "$NGINX_DEFAULT_HTTPS_PORT_NUMBER" "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf"
+nginx_configure_port "$NGINX_DEFAULT_HTTPS_PORT_NUMBER" "${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates/default-https-server-block.conf"
 
 # shellcheck disable=SC1091
 
diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
index 3fdc013c4b9a..8acc6a5cd422 100755
--- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
+++ b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
@@ -32,7 +32,7 @@ nginx_custom_init_scripts
 
 # Configure HTTPS port number
 if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] && is_file_writable "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"; then
-    cp "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
+    cp "${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
 fi
 
 # Initialize NGINX