🍕 Add canonical instead of generic

Signed-off-by: Edward Fitz Abucay <ffimnsr@gmail.com>
ffimnsr · Oct 20, 2023 · 01e6364 · 01e6364
1 parent 7a91b0f
commit 01e6364
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/data/s6-overlay/s6-rc.d/init-mailer-config/run b/data/s6-overlay/s6-rc.d/init-mailer-config/run
@@ -10,6 +10,7 @@ mkdir -p /var/spool/postfix/pid \
 TEMPLATES_DIR=/etc/templates
 dockerize \
   -template $TEMPLATES_DIR/postfix/aliases.tmpl:/etc/postfix/aliases \
+  -template $TEMPLATES_DIR/postfix/canonical.tmpl:/etc/postfix/canonical \
   -template $TEMPLATES_DIR/postfix/generic.tmpl:/etc/postfix/generic \
   -template $TEMPLATES_DIR/postfix/main.cf.tmpl:/etc/postfix/main.cf \
   -template $TEMPLATES_DIR/postfix/master.cf.tmpl:/etc/postfix/master.cf \

diff --git a/data/templates/postfix/canonical.tmpl b/data/templates/postfix/canonical.tmpl
@@ -0,0 +1,3 @@
+root@{{ .Env.JMAIL_ORIGIN }} noreply@{{ .Env.JMAIL_ORIGIN }}
+root@localhost noreply@{{ .Env.JMAIL_ORIGIN }}
+root@localhost.localdomain noreply@{{ .Env.JMAIL_ORIGIN }}
diff --git a/data/templates/postfix/main.cf.tmpl b/data/templates/postfix/main.cf.tmpl
@@ -22,7 +22,7 @@ smtpd_tls_auth_only = yes
 smtpd_tls_loglevel = 1
 
 # Outgoing
-smtp_generic_maps = lmdb:/etc/postfix/generic
+# smtp_generic_maps = lmdb:/etc/postfix/generic
 smtp_tls_CApath = /etc/ssl/certs
 smtp_tls_security_level = encrypt
 smtp_tls_session_cache_database = lmdb:${data_directory}/smtp_scache
@@ -41,6 +41,7 @@ non_smtpd_milters = $smtpd_milters
 
 alias_maps = lmdb:/etc/postfix/aliases
 alias_database = lmdb:/etc/postfix/aliases
+canonical_maps = lmdb:/etc/postfix/canonical
 relayhost =
 mailbox_size_limit = 0
 recipient_delimiter = +