diff options
Diffstat (limited to 'modules/private/mail/relay.nix')
-rw-r--r-- | modules/private/mail/relay.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/modules/private/mail/relay.nix b/modules/private/mail/relay.nix index 6ac3df8..18d6bc3 100644 --- a/modules/private/mail/relay.nix +++ b/modules/private/mail/relay.nix | |||
@@ -161,7 +161,7 @@ | |||
161 | relay_domains = let | 161 | relay_domains = let |
162 | backups = lib.flatten (lib.attrsets.mapAttrsToList (n: v: v.domains or []) config.myEnv.mail.postfix.backup_domains); | 162 | backups = lib.flatten (lib.attrsets.mapAttrsToList (n: v: v.domains or []) config.myEnv.mail.postfix.backup_domains); |
163 | virtual_domains = config.myEnv.mail.postfix.additional_mailbox_domains | 163 | virtual_domains = config.myEnv.mail.postfix.additional_mailbox_domains |
164 | ++ lib.remove "localhost.immae.eu" (lib.remove null (lib.flatten (map | 164 | ++ lib.remove null (lib.flatten (map |
165 | (zone: map | 165 | (zone: map |
166 | (e: if e.receive | 166 | (e: if e.receive |
167 | then "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}" | 167 | then "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}" |
@@ -170,7 +170,7 @@ | |||
170 | (zone.withEmail or []) | 170 | (zone.withEmail or []) |
171 | ) | 171 | ) |
172 | config.myEnv.dns.masterZones | 172 | config.myEnv.dns.masterZones |
173 | ))); | 173 | )); |
174 | in | 174 | in |
175 | backups ++ virtual_domains; | 175 | backups ++ virtual_domains; |
176 | relay_recipient_maps = let | 176 | relay_recipient_maps = let |
@@ -217,13 +217,6 @@ | |||
217 | enable = true; | 217 | enable = true; |
218 | enableSmtp = true; | 218 | enableSmtp = true; |
219 | enableSubmission = false; | 219 | enableSubmission = false; |
220 | # FIXME: Mail adressed to localhost.immae.eu will still have mx-1 as | ||
221 | # prioritized MX, which provokes "mail for localhost.immae.eu loops | ||
222 | # back to myself" errors. This transport entry forces to push | ||
223 | # e-mails to its right destination. | ||
224 | transport = '' | ||
225 | localhost.immae.eu smtp:[immae.eu]:25 | ||
226 | ''; | ||
227 | destination = ["localhost"]; | 220 | destination = ["localhost"]; |
228 | # This needs to reverse DNS | 221 | # This needs to reverse DNS |
229 | hostname = config.hostEnv.fqdn; | 222 | hostname = config.hostEnv.fqdn; |