From 1449629479ebf9dbd1e63fc78b0d7b9c1b6cd2ff Mon Sep 17 00:00:00 2001
From: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
Date: Mon, 15 Jan 2024 11:23:23 +1300
Subject: [PATCH] fix: Revert quoting `SA_SPAM_SUBJECT` in `mailserver.env`
 (#3767)

In Docker Compose `.env` files are parsed properly when values are wrapped with quotes. Trailing white-space is also discarded, like it would be with shell variables.

This is not the case with `docker run` or other CRI like `podman` (_including it's compose equivalent support_). Those will parse the quotes to be included in a literal string value. Trailing white-space is also retained.

Hence a default with a trailing space is not compatible across CRI. This change documents the default with additional context on how to include a trailing white-space with a custom value for the users CRI choice. It additionally clearly communicates the opt-out value for this feature.
---
 mailserver.env | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mailserver.env b/mailserver.env
index 49bc2cca..9b085c9f 100644
--- a/mailserver.env
+++ b/mailserver.env
@@ -401,7 +401,10 @@ SA_TAG2=6.31
 SA_KILL=10.0
 
 # add tag to subject if spam detected
-SA_SPAM_SUBJECT='***SPAM*** '
+# The value `undef` opts-out of this feature. The value shown below is the default.
+# NOTE: By default spam is delivered to a junk folder, reducing the value of adding a subject prefix.
+# NOTE: If not using Docker Compose, other CRI may require the single quotes removed.
+#SA_SPAM_SUBJECT='***SPAM*** '
 
 # -----------------------------------------------
 # --- Fetchmail Section -------------------------