From 36e6757abc9ce8eb2b69c6ab4942d15bee434e03 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Sat, 1 May 2021 10:00:15 +0000
Subject: [PATCH] 4.0.24-debian-9-r14 release

---
 .../mongodb-sharded/4.0/debian-9/Dockerfile   |  2 +-
 .../mongodb/templates/mongodb.conf.tpl        |  2 +-
 .../rootfs/opt/bitnami/scripts/libmongodb.sh  | 26 +++++++++++++++++++
 .../rootfs/opt/bitnami/scripts/mongodb-env.sh |  3 +++
 bitnami/mongodb-sharded/README.md             |  2 +-
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/bitnami/mongodb-sharded/4.0/debian-9/Dockerfile b/bitnami/mongodb-sharded/4.0/debian-9/Dockerfile
index 36567026f839..d2042b98d457 100644
--- a/bitnami/mongodb-sharded/4.0/debian-9/Dockerfile
+++ b/bitnami/mongodb-sharded/4.0/debian-9/Dockerfile
@@ -22,7 +22,7 @@ RUN ln -s /opt/bitnami/scripts/mongodb-sharded/run.sh /run.sh
 COPY rootfs /
 RUN /opt/bitnami/scripts/mongodb-sharded/postunpack.sh
 ENV BITNAMI_APP_NAME="mongodb-sharded" \
-    BITNAMI_IMAGE_VERSION="4.0.24-debian-9-r13" \
+    BITNAMI_IMAGE_VERSION="4.0.24-debian-9-r14" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/mongodb/bin:$PATH"
 
 EXPOSE 27017
diff --git a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/mongodb/templates/mongodb.conf.tpl b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/mongodb/templates/mongodb.conf.tpl
index b8e85ebc1174..0a5dbe5765ed 100644
--- a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/mongodb/templates/mongodb.conf.tpl
+++ b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/mongodb/templates/mongodb.conf.tpl
@@ -6,7 +6,7 @@
 storage:
   dbPath: {{MONGODB_DATA_DIR}}/db
   journal:
-    enabled: true
+    enabled: {{MONGODB_DEFAULT_ENABLE_JOURNAL}}
   directoryPerDB: {{MONGODB_DEFAULT_ENABLE_DIRECTORY_PER_DB}}
 
 # where to write logging data.
diff --git a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb.sh
index 998b5c9f445f..782ccf5ff56a 100644
--- a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb.sh
+++ b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb.sh
@@ -349,6 +349,31 @@ mongodb_set_log_conf() {
     fi
 }
 
+
+########################
+# Change journaling setting
+# Globals:
+#   MONGODB_*
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+mongodb_set_journal_conf() {
+    local -r conf_file_path="${1:-$MONGODB_CONF_FILE}"
+    local -r conf_file_name="${conf_file_path#"$MONGODB_CONF_DIR"}"
+    local mongodb_conf
+
+    if ! mongodb_is_file_external "$conf_file_name"; then
+        if [[ -n "$MONGODB_ENABLE_JOURNAL" ]]; then
+            mongodb_conf="$(sed -E "/^ *journal:/,/^ *[^:]*:/s/enabled:.*/enabled: $({ is_boolean_yes "$MONGODB_ENABLE_JOURNAL" && echo 'true';} || echo 'false')/" "$conf_file_path")"
+            echo "$mongodb_conf" > "$conf_file_path"
+        fi
+    else
+        debug "$conf_file_name mounted. Skipping setting log settings"
+    fi
+}
+
 ########################
 # Change common storage settings
 # Globals:
@@ -1057,6 +1082,7 @@ mongodb_initialize() {
     mongodb_copy_mounted_config
     mongodb_set_net_conf "$MONGODB_CONF_FILE"
     mongodb_set_log_conf "$MONGODB_CONF_FILE"
+    mongodb_set_journal_conf "$MONGODB_CONF_FILE"
     mongodb_set_storage_conf "$MONGODB_CONF_FILE"
     is_boolean_yes "$MONGODB_DISABLE_JAVASCRIPT" && mongodb_disable_javascript_conf "$MONGODB_CONF_FILE"
 
diff --git a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-env.sh b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-env.sh
index a795b4c53281..61fadf393438 100644
--- a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-env.sh
+++ b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-env.sh
@@ -30,6 +30,7 @@ mongodb_env_vars=(
     MONGODB_CLIENT_EXTRA_FLAGS
     MONGODB_ADVERTISED_HOSTNAME
     MONGODB_DISABLE_JAVASCRIPT
+    MONGODB_ENABLE_JOURNAL
     MONGODB_DISABLE_SYSTEM_LOG
     MONGODB_ENABLE_DIRECTORY_PER_DB
     MONGODB_ENABLE_IPV6
@@ -104,6 +105,8 @@ export MONGODB_EXTRA_FLAGS="${MONGODB_EXTRA_FLAGS:-}"
 export MONGODB_CLIENT_EXTRA_FLAGS="${MONGODB_CLIENT_EXTRA_FLAGS:-}"
 export MONGODB_ADVERTISED_HOSTNAME="${MONGODB_ADVERTISED_HOSTNAME:-}"
 export MONGODB_DISABLE_JAVASCRIPT="${MONGODB_DISABLE_JAVASCRIPT:-no}"
+export MONGODB_ENABLE_JOURNAL="${MONGODB_ENABLE_JOURNAL:-}"
+export MONGODB_DEFAULT_ENABLE_JOURNAL="true"
 export MONGODB_DISABLE_SYSTEM_LOG="${MONGODB_DISABLE_SYSTEM_LOG:-}"
 export MONGODB_DEFAULT_DISABLE_SYSTEM_LOG="false"
 export MONGODB_ENABLE_DIRECTORY_PER_DB="${MONGODB_ENABLE_DIRECTORY_PER_DB:-}"
diff --git a/bitnami/mongodb-sharded/README.md b/bitnami/mongodb-sharded/README.md
index d5634e7e8d9b..884e70927288 100644
--- a/bitnami/mongodb-sharded/README.md
+++ b/bitnami/mongodb-sharded/README.md
@@ -50,7 +50,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`4.4`, `4.4-debian-10`, `4.4.5`, `4.4.5-debian-10-r19`, `latest` (4.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.4.5-debian-10-r19/4.4/debian-10/Dockerfile)
 * [`4.2`, `4.2-debian-10`, `4.2.13`, `4.2.13-debian-10-r40` (4.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.2.13-debian-10-r40/4.2/debian-10/Dockerfile)
-* [`4.0`, `4.0-debian-9`, `4.0.24`, `4.0.24-debian-9-r13` (4.0/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.0.24-debian-9-r13/4.0/debian-9/Dockerfile)
+* [`4.0`, `4.0-debian-9`, `4.0.24`, `4.0.24-debian-9-r14` (4.0/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.0.24-debian-9-r14/4.0/debian-9/Dockerfile)
 * [`3.6`, `3.6-debian-9`, `3.6.23`, `3.6.23-debian-9-r41` (3.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/3.6.23-debian-9-r41/3.6/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/mongodb GitHub repo](https://github.com/bitnami/bitnami-docker-mongodb).