From 2f82842e39cf0d8209873967284a14c690d25095 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 10 Nov 2021 23:15:59 +0000
Subject: [PATCH] 4.10.4-debian-10-r31 release

---
 bitnami/parse/4/debian-10/Dockerfile                          | 2 +-
 .../debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh  | 4 ++--
 .../debian-10/rootfs/opt/bitnami/scripts/libmongodbclient.sh  | 3 ++-
 bitnami/parse/README.md                                       | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bitnami/parse/4/debian-10/Dockerfile b/bitnami/parse/4/debian-10/Dockerfile
index 28fec7c52c0f..23d35f11312c 100644
--- a/bitnami/parse/4/debian-10/Dockerfile
+++ b/bitnami/parse/4/debian-10/Dockerfile
@@ -19,7 +19,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/parse/postunpack.sh
 ENV BITNAMI_APP_NAME="parse" \
-    BITNAMI_IMAGE_VERSION="4.10.4-debian-10-r30" \
+    BITNAMI_IMAGE_VERSION="4.10.4-debian-10-r31" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/mongodb/bin:/opt/bitnami/mongodb-client/bin:/opt/bitnami/parse/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 1337 3000
diff --git a/bitnami/parse/4/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/parse/4/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 785d883f325e..459f99c7d1cd 100644
--- a/bitnami/parse/4/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/parse/4/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -178,13 +178,13 @@ web_server_reload() {
 # Apache-specific flags:
 #   --apache-additional-configuration - Additional vhost configuration (no default)
 #   --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
-#   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no')
+#   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined)
 #   --apache-extra-directory-configuration - Extra configuration for the document root directory
 #   --apache-proxy-address - Address where to proxy requests
 #   --apache-proxy-configuration - Extra configuration for the proxy
 #   --apache-proxy-http-configuration - Extra configuration for the proxy HTTP vhost
 #   --apache-proxy-https-configuration - Extra configuration for the proxy HTTPS vhost
-#   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
+#   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined)
 # NGINX-specific flags:
 #   --nginx-additional-configuration - Additional server block configuration (no default)
 #   --nginx-external-configuration - Configuration external to server block (no default)
diff --git a/bitnami/parse/4/debian-10/rootfs/opt/bitnami/scripts/libmongodbclient.sh b/bitnami/parse/4/debian-10/rootfs/opt/bitnami/scripts/libmongodbclient.sh
index 43ace8a609d0..c4e8d8f4f17b 100644
--- a/bitnami/parse/4/debian-10/rootfs/opt/bitnami/scripts/libmongodbclient.sh
+++ b/bitnami/parse/4/debian-10/rootfs/opt/bitnami/scripts/libmongodbclient.sh
@@ -83,12 +83,13 @@ mongodb_client_initialize() {
         # https://www.mongodb.com/basics/create-database
         info "Creating database ${MONGODB_CLIENT_CREATE_DATABASE_NAME} and user ${MONGODB_CLIENT_CREATE_DATABASE_NAME}"
         debug_execute mongodb_execute "${mongodb_execute_args[@]}" <<EOF
-if (!db.system.users.findOne({_id: '${MONGODB_CLIENT_CREATE_DATABASE_NAME}.${MONGODB_CLIENT_CREATE_DATABASE_USERNAME}'}))
+if (!db.getSiblingDB('${MONGODB_CLIENT_CREATE_DATABASE_NAME}').getUser('${MONGODB_CLIENT_CREATE_DATABASE_USERNAME}')) {
   db.getSiblingDB('${MONGODB_CLIENT_CREATE_DATABASE_NAME}').createUser({
     user: '${MONGODB_CLIENT_CREATE_DATABASE_USERNAME}',
     pwd: '${MONGODB_CLIENT_CREATE_DATABASE_PASSWORD}',
     roles: [{role: 'readWrite', db: '${MONGODB_CLIENT_CREATE_DATABASE_NAME}'}],
   });
+}
 EOF
     fi
 }
diff --git a/bitnami/parse/README.md b/bitnami/parse/README.md
index 87c0cb0bc795..57b92238ce61 100644
--- a/bitnami/parse/README.md
+++ b/bitnami/parse/README.md
@@ -44,7 +44,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`4`, `4-debian-10`, `4.10.4`, `4.10.4-debian-10-r30`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-parse/blob/4.10.4-debian-10-r30/4/debian-10/Dockerfile)
+* [`4`, `4-debian-10`, `4.10.4`, `4.10.4-debian-10-r31`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-parse/blob/4.10.4-debian-10-r31/4/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/parse GitHub repo](https://github.com/bitnami/bitnami-docker-parse).