From 1681dcbd03657c3606b537090d5ad6db6f54389e Mon Sep 17 00:00:00 2001
From: Tran Sang <me@transa.ng>
Date: Wed, 18 Jan 2023 02:58:00 +0900
Subject: [PATCH 1/3] support incoming email integration

---
 README.md     |  6 ++++++
 entrypoint.sh | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/README.md b/README.md
index 80e0ab0aee..c131687347 100644
--- a/README.md
+++ b/README.md
@@ -197,6 +197,12 @@ by [setting the IPs][loadbalancer-ips] under `[loadbalancer]` in `zulip.conf`.
 
 [loadbalancer-ips]: https://zulip.readthedocs.io/en/latest/production/deployment.html#configuring-zulip-to-trust-proxies
 
+**Additional puppet classes**. If you need to do additional puppet classes, you can set `ADDITIONAL_PUPPET_CLASSES` to a comma-separated list of puppet classes. This will tell Zulip to run the puppet classes under `[additional_puppet_classes]` in `zulip.conf`.
+For example: `ADDITIONAL_PUPPET_CLASSES="zulip::postfix_localmail"`.
+
+**Mail name**. If you need to set the mail name to used in [Local delivery setup for incoming email integration](https://zulip.readthedocs.io/en/latest/production/email-gateway.html#local-delivery-setup), you can set `MAILNAME` to the mail name. This will tell Zulip to add the mail name configuration under `[postfix]` in `zulip.conf`.
+
+
 ### Manual configuration
 
 The way the environment variables configuration process described in
diff --git a/entrypoint.sh b/entrypoint.sh
index 77ff692bd0..4ca073d261 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -156,6 +156,34 @@ additionalPuppetConfiguration() {
         echo "No additional puppet configuration executed for load balancer IPs."
     fi
 
+    if [ -n "$ADDITIONAL_PUPPET_CLASSES" ]; then
+        echo "Add additional puppet classes"
+        current_classes=$(crudini --get /etc/zulip/zulip.conf machine puppet_classes)
+        if [ -n "$current_classes" ]; then
+            echo "Add additional puppet classes to existing"
+            crudini --set /etc/zulip/zulip.conf machine puppet_classes "${current_classes}, ${ADDITIONAL_PUPPET_CLASSES}"
+        else
+            echo "No existing puppet classes, just setting"
+            crudini --set /etc/zulip/zulip.conf machine puppet_classes "${ADDITIONAL_PUPPET_CLASSES}"
+        fi
+        changedPuppetConf=true
+        requireUpdateApt=true
+    else
+        echo "No additional puppet classes."
+    fi
+
+    if [ -n "$MAILNAME" ]; then
+        echo "Setup mail name for postfix"
+        crudini --set /etc/zulip/zulip.conf postfix mailname "${MAILNAME}"
+        changedPuppetConf=true
+    else
+        echo "No config for mail name for postfix"
+    fi
+
+    if [ "$requireUpdateApt" = true ]; then
+      apt update
+    fi
+
     if [ "$changedPuppetConf" = true ]; then
         /home/zulip/deployments/current/scripts/zulip-puppet-apply -f
     fi

From d46b2b5899fc6e85f0547b5f524441501a496412 Mon Sep 17 00:00:00 2001
From: Tran Sang <me@transa.ng>
Date: Wed, 18 Jan 2023 03:02:57 +0900
Subject: [PATCH 2/3] declare var

---
 entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 4ca073d261..694f3f361b 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -135,6 +135,7 @@ additionalPuppetConfiguration() {
     echo "Executing additional puppet configuration ..."
 
     local changedPuppetConf=false
+    local requireUpdateApt=false
 
     if [ "$QUEUE_WORKERS_MULTIPROCESS" == "True" ] || [ "$QUEUE_WORKERS_MULTIPROCESS" == "true" ]; then
         echo "Setting queue workers to run in multiprocess mode ..."
@@ -183,7 +184,6 @@ additionalPuppetConfiguration() {
     if [ "$requireUpdateApt" = true ]; then
       apt update
     fi
-
     if [ "$changedPuppetConf" = true ]; then
         /home/zulip/deployments/current/scripts/zulip-puppet-apply -f
     fi

From fdec39b7f1a11df57508002204396f7f3cd5699d Mon Sep 17 00:00:00 2001
From: Sang <t@sang.jp>
Date: Sat, 9 Nov 2024 11:49:25 +0900
Subject: [PATCH 3/3] no newline change

---
 entrypoint.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 794f780ecd..332dcf3169 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -133,7 +133,6 @@ puppetConfiguration() {
         echo "Disabling https in nginx."
         crudini --set /etc/zulip/zulip.conf application_server http_only true
     fi
-
     if [ "$QUEUE_WORKERS_MULTIPROCESS" == "True" ] || [ "$QUEUE_WORKERS_MULTIPROCESS" == "true" ]; then
         echo "Setting queue workers to run in multiprocess mode ..."
         crudini --set /etc/zulip/zulip.conf application_server queue_workers_multiprocess true