add support for changing MailCommand from environment variable

netsandbox · Feb 11, 2024 · a04300b · a04300b
1 parent 56e731d
commit a04300b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 3 deletions.
diff --git a/4.4/RT_SiteConfig.pm b/4.4/RT_SiteConfig.pm
@@ -1,7 +1,7 @@
 use utf8;
 
 Set($CanonicalizeRedirectURLs, RT_CANONICALIZE_REDIRECT_URLS);
-Set($MailCommand, "testfile");
+Set($MailCommand, "RT_MAIL_COMMAND");
 Set($WebDomain, "RT_WEB_DOMAIN");
 Set($WebPort, RT_WEB_PORT);
 

diff --git a/4.4/docker-entrypoint.sh b/4.4/docker-entrypoint.sh
@@ -3,13 +3,15 @@
 set -euo pipefail
 
 : "${RT_CANONICALIZE_REDIRECT_URLS:=0}"
+: "${RT_MAIL_COMMAND:=testfile}"
 : "${RT_WEB_DOMAIN:=localhost}"
 : "${RT_WEB_PORT:=80}"
 
 : "${RT_ROOT_PASSWORD:=}"
 
 sed -i \
   -e "s/RT_CANONICALIZE_REDIRECT_URLS/$RT_CANONICALIZE_REDIRECT_URLS/" \
+  -e "s/RT_MAIL_COMMAND/$RT_MAIL_COMMAND/" \
   -e "s/RT_WEB_DOMAIN/$RT_WEB_DOMAIN/" \
   -e "s/RT_WEB_PORT/$RT_WEB_PORT/" \
   /opt/rt4/etc/RT_SiteConfig.pm

diff --git a/5.0/RT_SiteConfig.pm b/5.0/RT_SiteConfig.pm
@@ -1,7 +1,7 @@
 use utf8;
 
 Set($CanonicalizeRedirectURLs, RT_CANONICALIZE_REDIRECT_URLS);
-Set($MailCommand, "testfile");
+Set($MailCommand, "RT_MAIL_COMMAND");
 Set($WebDomain, "RT_WEB_DOMAIN");
 Set($WebPort, RT_WEB_PORT);
 

diff --git a/5.0/docker-entrypoint.sh b/5.0/docker-entrypoint.sh
@@ -3,13 +3,15 @@
 set -euo pipefail
 
 : "${RT_CANONICALIZE_REDIRECT_URLS:=0}"
+: "${RT_MAIL_COMMAND:=testfile}"
 : "${RT_WEB_DOMAIN:=localhost}"
 : "${RT_WEB_PORT:=80}"
 
 : "${RT_ROOT_PASSWORD:=}"
 
 sed -i \
   -e "s/RT_CANONICALIZE_REDIRECT_URLS/$RT_CANONICALIZE_REDIRECT_URLS/" \
+  -e "s/RT_MAIL_COMMAND/$RT_MAIL_COMMAND/" \
   -e "s/RT_WEB_DOMAIN/$RT_WEB_DOMAIN/" \
   -e "s/RT_WEB_PORT/$RT_WEB_PORT/" \
   /opt/rt5/etc/RT_SiteConfig.pm

diff --git a/README.md b/README.md
@@ -83,6 +83,7 @@ Then, access it via `http://localhost:8080` or `http://host-ip:8080` in a browse
 | Environment Variable | Description |
 | --- | --- |
 | `RT_CANONICALIZE_REDIRECT_URLS` | RT [CanonicalizeRedirectURLs](https://docs.bestpractical.com/rt/latest/RT_Config.html#CanonicalizeRedirectURLs) |
+| `RT_MAIL_COMMAND` | RT [MailCommand](https://docs.bestpractical.com/rt/latest/RT_Config.html#MailCommand), Default is 'testfile' |
 | `RT_ROOT_PASSWORD` | RT root user password |
 | `RT_WEB_DOMAIN` | RT [WebDomain](https://docs.bestpractical.com/rt/latest/RT_Config.html#WebDomain) |
 | `RT_WEB_PORT` | RT [WebPort](https://docs.bestpractical.com/rt/latest/RT_Config.html#WebPort) |

diff --git a/RT_SiteConfig.pm b/RT_SiteConfig.pm
@@ -1,7 +1,7 @@
 use utf8;
 
 Set($CanonicalizeRedirectURLs, RT_CANONICALIZE_REDIRECT_URLS);
-Set($MailCommand, "testfile");
+Set($MailCommand, "RT_MAIL_COMMAND");
 Set($WebDomain, "RT_WEB_DOMAIN");
 Set($WebPort, RT_WEB_PORT);
 

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -3,13 +3,15 @@
 set -euo pipefail
 
 : "${RT_CANONICALIZE_REDIRECT_URLS:=0}"
+: "${RT_MAIL_COMMAND:=testfile}"
 : "${RT_WEB_DOMAIN:=localhost}"
 : "${RT_WEB_PORT:=80}"
 
 : "${RT_ROOT_PASSWORD:=}"
 
 sed -i \
   -e "s/RT_CANONICALIZE_REDIRECT_URLS/$RT_CANONICALIZE_REDIRECT_URLS/" \
+  -e "s/RT_MAIL_COMMAND/$RT_MAIL_COMMAND/" \
   -e "s/RT_WEB_DOMAIN/$RT_WEB_DOMAIN/" \
   -e "s/RT_WEB_PORT/$RT_WEB_PORT/" \
   /opt/rt%%RT_VERSION_MAJOR%%/etc/RT_SiteConfig.pm