From a6cda1fc591c6f60ff6bf2a9bfd87f66f7009da7 Mon Sep 17 00:00:00 2001
From: Alex Harrington <alex@springsignage.com>
Date: Thu, 27 May 2021 18:20:42 +0100
Subject: [PATCH] Make msmtp from variable fully configurable. Fixes
 xibosignage/xibo#2519

---
 Dockerfile           | 1 +
 docker/entrypoint.sh | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2484ad1f8e..e0372fb86f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -141,6 +141,7 @@ ENV CMS_DEV_MODE=false \
     CMS_SMTP_REWRITE_DOMAIN=gmail.com \
     CMS_SMTP_HOSTNAME=none \
     CMS_SMTP_FROM_LINE_OVERRIDE=YES \
+    CMS_SMTP_FROM=none \
     CMS_ALIAS=none \
     CMS_PHP_SESSION_GC_MAXLIFETIME=1440 \
     CMS_PHP_POST_MAX_SIZE=2G \
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index aabd9e58b1..a403f00389 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -250,8 +250,13 @@ then
 
     /bin/sed -i "s/maildomain .*$/maildomain $CMS_SMTP_REWRITE_DOMAIN/" /etc/msmtprc
     /bin/sed -i "s/domain .*$/domain $CMS_SMTP_HOSTNAME/" /etc/msmtprc
-    
-    /bin/sed -i "s/from .*$/from cms@$CMS_SMTP_REWRITE_DOMAIN/" /etc/msmtprc
+
+    if [ "$CMS_SMTP_FROM" == "none" ]
+    then    
+      /bin/sed -i "s/from .*$/from cms@$CMS_SMTP_REWRITE_DOMAIN/" /etc/msmtprc
+    else
+      /bin/sed -i "s/from .*$/from $CMS_SMTP_FROM/" /etc/msmtprc
+    fi
 
     mkdir -p /var/www/cms/library/temp
     chown apache.apache -R /var/www/cms/library