diff options
Diffstat (limited to 'modules/private/mail/postfix.nix')
-rw-r--r-- | modules/private/mail/postfix.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix index 2af1849..d8640f8 100644 --- a/modules/private/mail/postfix.nix +++ b/modules/private/mail/postfix.nix | |||
@@ -292,7 +292,7 @@ | |||
292 | ### Virtual mailboxes config | 292 | ### Virtual mailboxes config |
293 | virtual_alias_maps = "hash:/etc/postfix/virtual mysql:${config.secrets.fullPaths."postfix/mysql_alias_maps"} ldap:${config.secrets.fullPaths."postfix/ldap_ejabberd_users_immae_fr"}"; | 293 | virtual_alias_maps = "hash:/etc/postfix/virtual mysql:${config.secrets.fullPaths."postfix/mysql_alias_maps"} ldap:${config.secrets.fullPaths."postfix/ldap_ejabberd_users_immae_fr"}"; |
294 | virtual_mailbox_domains = config.myEnv.mail.postfix.additional_mailbox_domains | 294 | virtual_mailbox_domains = config.myEnv.mail.postfix.additional_mailbox_domains |
295 | ++ lib.remove "localhost.immae.eu" (lib.remove null (lib.flatten (map | 295 | ++ lib.remove null (lib.flatten (map |
296 | (zone: map | 296 | (zone: map |
297 | (e: if e.receive | 297 | (e: if e.receive |
298 | then "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}" | 298 | then "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}" |
@@ -301,7 +301,7 @@ | |||
301 | (zone.withEmail or []) | 301 | (zone.withEmail or []) |
302 | ) | 302 | ) |
303 | config.myEnv.dns.masterZones | 303 | config.myEnv.dns.masterZones |
304 | ))); | 304 | )); |
305 | virtual_mailbox_maps = "hash:/etc/postfix/host_dummy_mailboxes mysql:${config.secrets.fullPaths."postfix/mysql_mailbox_maps"}"; | 305 | virtual_mailbox_maps = "hash:/etc/postfix/host_dummy_mailboxes mysql:${config.secrets.fullPaths."postfix/mysql_mailbox_maps"}"; |
306 | dovecot_destination_recipient_limit = "1"; | 306 | dovecot_destination_recipient_limit = "1"; |
307 | virtual_transport = "dovecot"; | 307 | virtual_transport = "dovecot"; |
@@ -379,13 +379,6 @@ | |||
379 | milter_macro_daemon_name = "ORIGINATING"; | 379 | milter_macro_daemon_name = "ORIGINATING"; |
380 | smtpd_milters = "unix:${config.myServices.mail.milters.sockets.opendkim}"; | 380 | smtpd_milters = "unix:${config.myServices.mail.milters.sockets.opendkim}"; |
381 | }; | 381 | }; |
382 | # FIXME: Mail adressed to localhost.immae.eu will still have mx-1 as | ||
383 | # prioritized MX, which provokes "mail for localhost.immae.eu loops | ||
384 | # back to myself" errors. This transport entry forces to push | ||
385 | # e-mails to its right destination. | ||
386 | transport = '' | ||
387 | localhost.immae.eu smtp:[immae.eu]:25 | ||
388 | ''; | ||
389 | destination = ["localhost"]; | 382 | destination = ["localhost"]; |
390 | # This needs to reverse DNS | 383 | # This needs to reverse DNS |
391 | hostname = config.hostEnv.fqdn; | 384 | hostname = config.hostEnv.fqdn; |