Allow different from email than smtp user

Yannik · May 14, 2020 · 6228490 · 6228490
1 parent d13ff2d
commit 6228490
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -42,8 +42,10 @@ Role Variables
 * `relaymail_smtp_user`: username to authenticate with at the relaying mailserver (required)
     * Example: `[email protected]`
 * `relaymail_smtp_password`: password to authenticate with at the rayling mailserver (required)
-* `relaymail_force_from_address`: force the from address to be the `relaymail_smtp_user`
+* `relaymail_force_from_address`: force the from address to `relaymail_smtp_user` or `relaymail_from_address` if it is defined
     * Default: `true`
+* `relaymail_from_address`: optional from address to be used by `relaymail_force_from_address` instead of `relaymail_smtp_user`
+    * Example: `user` or `[email protected]`
 * `relaymail_overwrite_to`: `all` overwrites the to address for all emails, `local` overwrites the to address for emails addressed to local users, `none` does never overwrite the to address
     * Default: `all`
 * `relaymail_overwrite_to_target`: email address which mails with overwritten to should be sent to (required when `relaymail_overwrite_to` is not `none`)

diff --git a/templates/sender_canonical_maps b/templates/sender_canonical_maps
@@ -1,3 +1,3 @@
 #{{ ansible_managed }}
 
-/.+/    {{ relaymail_smtp_user }}
+/.+/    {{ relaymail_from_address|default(relaymail_smtp_user) }}