From af07d3ef3df79f0a593d37b43e9ff829fb39b913 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Fri, 26 Sep 2025 22:08:10 -0500
Subject: [PATCH] entrypoint: Use DB_NAME / DB_USER for PostgreSQL database
 name / user.

---
 entrypoint.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/entrypoint.sh b/entrypoint.sh
index cb2eb98..a546361 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -155,6 +155,16 @@ puppetConfiguration() {
         crudini --set /etc/zulip/zulip.conf http_proxy allow_ranges "${PROXY_ALLOW_RANGES}"
     fi
 
+    if [ "$DB_NAME" != "zulip" ]; then
+        echo "Setting database name to $DB_NAME"
+        crudini --set /etc/zulip/zulip.conf postgresql database_name "$DB_NAME"
+    fi
+
+    if [ "$DB_USER" != "zulip" ]; then
+        echo "Setting database user to $DB_USER"
+        crudini --set /etc/zulip/zulip.conf postgresql database_user "$DB_USER"
+    fi
+
     /home/zulip/deployments/current/scripts/zulip-puppet-apply -f
 }
 configureCerts() {