From 3171d7af1fd0646a75479bcd737f35b791a39f47 Mon Sep 17 00:00:00 2001
From: Douglas Thomson <djt210@gmail.com>
Date: Wed, 17 May 2023 17:30:04 +0100
Subject: [PATCH] Enabling the configuration of the hostname during
 initialization. Done via the environment variable MONGODB_LOCALHOST_NAME

Signed-off-by: Douglas Thomson <djt210@gmail.com>
---
 .../debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh    | 8 ++++----
 .../debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh   | 2 ++
 .../debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh    | 8 ++++----
 .../debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh   | 2 ++
 bitnami/mongodb/README.md                                 | 2 ++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
index 81a1893a3aaa2..b5b16f0c83218 100644
--- a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
+++ b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
@@ -667,7 +667,7 @@ mongodb_create_user() {
     [[ -z "$database" ]] && query="db.getSiblingDB(db.stats().db).createUser({ user: '$user', pwd: '$password', roles: [{role: 'readWrite', db: db.getSiblingDB(db.stats().db).stats().db }] })"
     # Create user, discarding mongo CLI output for clean logs
     info "Creating user '$user'..."
-    mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "127.0.0.1" <<<"$query"
+    mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "$MONGODB_LOCALHOST_NAME" <<<"$query"
 }
 
 ########################
@@ -684,7 +684,7 @@ mongodb_create_users() {
 
     if [[ -n "$MONGODB_ROOT_PASSWORD" ]] && ! [[ "$MONGODB_REPLICA_SET_MODE" =~ ^(secondary|arbiter|hidden) ]]; then
         info "Creating $MONGODB_ROOT_USER user..."
-        mongodb_execute "" "" "" "127.0.0.1" <<EOF
+        mongodb_execute "" "" "" "$MONGODB_LOCALHOST_NAME" <<EOF
 db.getSiblingDB('admin').createUser({ user: '$MONGODB_ROOT_USER', pwd: '$MONGODB_ROOT_PASSWORD', roles: [{role: 'root', db: 'admin'}] })
 EOF
     fi
@@ -714,7 +714,7 @@ EOF
 
     if [[ -n "$MONGODB_METRICS_USERNAME" ]] && [[ -n "$MONGODB_METRICS_PASSWORD" ]]; then
         info "Creating '$MONGODB_METRICS_USERNAME' user..."
-        mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "127.0.0.1" <<EOF
+        mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "$MONGODB_LOCALHOST_NAME" <<EOF
 db.getSiblingDB('admin').createUser({ user: '$MONGODB_METRICS_USERNAME', pwd: '$MONGODB_METRICS_PASSWORD', roles: [{role: 'clusterMonitor', db: 'admin'},{ role: 'read', db: 'local' }] })
 EOF
     fi
@@ -784,7 +784,7 @@ mongodb_is_primary_node_initiated() {
     local port="${2:?port is required}"
     local result
     result=$(
-        mongodb_execute_print_output "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "admin" "127.0.0.1" "$MONGODB_PORT_NUMBER" <<EOF
+        mongodb_execute_print_output "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "admin" "$MONGODB_LOCALHOST_NAME" "$MONGODB_PORT_NUMBER" <<EOF
 rs.initiate({"_id":"$MONGODB_REPLICA_SET_NAME", "members":[{"_id":0,"host":"$node:$port","priority":5}]})
 EOF
     )
diff --git a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh
index 2fe4de0e9b7a0..bd030670c0591 100644
--- a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh
+++ b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh
@@ -63,6 +63,7 @@ mongodb_env_vars=(
     MONGODB_PRIMARY_PORT_NUMBER
     MONGODB_PRIMARY_ROOT_PASSWORD
     MONGODB_PRIMARY_ROOT_USER
+    MONGODB_LOCALHOST_NAME
 )
 for env_var in "${mongodb_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -127,6 +128,7 @@ export MONGODB_ENABLE_IPV6="${MONGODB_ENABLE_IPV6:-}"
 export MONGODB_DEFAULT_ENABLE_IPV6="false"
 export MONGODB_SYSTEM_LOG_VERBOSITY="${MONGODB_SYSTEM_LOG_VERBOSITY:-}"
 export MONGODB_DEFAULT_SYSTEM_LOG_VERBOSITY="0"
+export MONGODB_LOCALHOST_NAME="${MONGODB_LOCALHOST_NAME:-127.0.0.1}"
 
 # User and database creation settings
 export MONGODB_ROOT_USER="${MONGODB_ROOT_USER:-root}"
diff --git a/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
index 81a1893a3aaa2..b5b16f0c83218 100644
--- a/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
+++ b/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
@@ -667,7 +667,7 @@ mongodb_create_user() {
     [[ -z "$database" ]] && query="db.getSiblingDB(db.stats().db).createUser({ user: '$user', pwd: '$password', roles: [{role: 'readWrite', db: db.getSiblingDB(db.stats().db).stats().db }] })"
     # Create user, discarding mongo CLI output for clean logs
     info "Creating user '$user'..."
-    mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "127.0.0.1" <<<"$query"
+    mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "$MONGODB_LOCALHOST_NAME" <<<"$query"
 }
 
 ########################
@@ -684,7 +684,7 @@ mongodb_create_users() {
 
     if [[ -n "$MONGODB_ROOT_PASSWORD" ]] && ! [[ "$MONGODB_REPLICA_SET_MODE" =~ ^(secondary|arbiter|hidden) ]]; then
         info "Creating $MONGODB_ROOT_USER user..."
-        mongodb_execute "" "" "" "127.0.0.1" <<EOF
+        mongodb_execute "" "" "" "$MONGODB_LOCALHOST_NAME" <<EOF
 db.getSiblingDB('admin').createUser({ user: '$MONGODB_ROOT_USER', pwd: '$MONGODB_ROOT_PASSWORD', roles: [{role: 'root', db: 'admin'}] })
 EOF
     fi
@@ -714,7 +714,7 @@ EOF
 
     if [[ -n "$MONGODB_METRICS_USERNAME" ]] && [[ -n "$MONGODB_METRICS_PASSWORD" ]]; then
         info "Creating '$MONGODB_METRICS_USERNAME' user..."
-        mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "127.0.0.1" <<EOF
+        mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "$MONGODB_LOCALHOST_NAME" <<EOF
 db.getSiblingDB('admin').createUser({ user: '$MONGODB_METRICS_USERNAME', pwd: '$MONGODB_METRICS_PASSWORD', roles: [{role: 'clusterMonitor', db: 'admin'},{ role: 'read', db: 'local' }] })
 EOF
     fi
@@ -784,7 +784,7 @@ mongodb_is_primary_node_initiated() {
     local port="${2:?port is required}"
     local result
     result=$(
-        mongodb_execute_print_output "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "admin" "127.0.0.1" "$MONGODB_PORT_NUMBER" <<EOF
+        mongodb_execute_print_output "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "admin" "$MONGODB_LOCALHOST_NAME" "$MONGODB_PORT_NUMBER" <<EOF
 rs.initiate({"_id":"$MONGODB_REPLICA_SET_NAME", "members":[{"_id":0,"host":"$node:$port","priority":5}]})
 EOF
     )
diff --git a/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh b/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh
index 2fe4de0e9b7a0..bd030670c0591 100644
--- a/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh
+++ b/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh
@@ -63,6 +63,7 @@ mongodb_env_vars=(
     MONGODB_PRIMARY_PORT_NUMBER
     MONGODB_PRIMARY_ROOT_PASSWORD
     MONGODB_PRIMARY_ROOT_USER
+    MONGODB_LOCALHOST_NAME
 )
 for env_var in "${mongodb_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -127,6 +128,7 @@ export MONGODB_ENABLE_IPV6="${MONGODB_ENABLE_IPV6:-}"
 export MONGODB_DEFAULT_ENABLE_IPV6="false"
 export MONGODB_SYSTEM_LOG_VERBOSITY="${MONGODB_SYSTEM_LOG_VERBOSITY:-}"
 export MONGODB_DEFAULT_SYSTEM_LOG_VERBOSITY="0"
+export MONGODB_LOCALHOST_NAME="${MONGODB_LOCALHOST_NAME:-127.0.0.1}"
 
 # User and database creation settings
 export MONGODB_ROOT_USER="${MONGODB_ROOT_USER:-root}"
diff --git a/bitnami/mongodb/README.md b/bitnami/mongodb/README.md
index b22c27495bd09..6fafc95062c78 100644
--- a/bitnami/mongodb/README.md
+++ b/bitnami/mongodb/README.md
@@ -579,6 +579,8 @@ Before starting the cluster you need to generate PEM certificates as required by
 
 Another option would be to use letsencrypt certificates; the required configuration steps for that scenario are left as an exercise for the user and are beyond the scope of this README.
 
+The hostname used during initialization can be configured using `MONGODB_LOCALHOST_NAME`. Use this to provide a vaild domain for your certificate. Preferably this hostname should be routed back to `127.0.0.1` through the hosts file. If not possible then progress can be made bybinding the mongo server to the correct ip, or all ips, in the configuration.
+
 #### Generating self-signed certificates
 
 * Generate a new private key which will be used to create your own Certificate Authority (CA):