diff options
Diffstat (limited to 'modules/private/mail/postfix.nix')
-rw-r--r-- | modules/private/mail/postfix.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix index 52cd77d..46d45c1 100644 --- a/modules/private/mail/postfix.nix +++ b/modules/private/mail/postfix.nix | |||
@@ -18,7 +18,7 @@ | |||
18 | hosts = unix:${config.myEnv.mail.postfix.mysql.socket} | 18 | hosts = unix:${config.myEnv.mail.postfix.mysql.socket} |
19 | dbname = ${config.myEnv.mail.postfix.mysql.database} | 19 | dbname = ${config.myEnv.mail.postfix.mysql.database} |
20 | query = SELECT DISTINCT destination | 20 | query = SELECT DISTINCT destination |
21 | FROM forwardings_merge | 21 | FROM forwardings |
22 | WHERE | 22 | WHERE |
23 | ((regex = 1 AND '%s' REGEXP CONCAT('^',source,'$') ) OR (regex = 0 AND source = '%s')) | 23 | ((regex = 1 AND '%s' REGEXP CONCAT('^',source,'$') ) OR (regex = 0 AND source = '%s')) |
24 | AND active = 1 | 24 | AND active = 1 |
@@ -73,7 +73,7 @@ | |||
73 | hosts = unix:${config.myEnv.mail.postfix.mysql.socket} | 73 | hosts = unix:${config.myEnv.mail.postfix.mysql.socket} |
74 | dbname = ${config.myEnv.mail.postfix.mysql.database} | 74 | dbname = ${config.myEnv.mail.postfix.mysql.database} |
75 | query = SELECT DISTINCT destination | 75 | query = SELECT DISTINCT destination |
76 | FROM forwardings_merge | 76 | FROM forwardings |
77 | WHERE | 77 | WHERE |
78 | ( | 78 | ( |
79 | (regex = 1 AND CONCAT(SUBSTRING_INDEX('%u', '+', 1), '@%d') REGEXP CONCAT('^',source,'$') ) | 79 | (regex = 1 AND CONCAT(SUBSTRING_INDEX('%u', '+', 1), '@%d') REGEXP CONCAT('^',source,'$') ) |
@@ -291,7 +291,11 @@ | |||
291 | alias_database = "\$alias_maps"; | 291 | alias_database = "\$alias_maps"; |
292 | 292 | ||
293 | ### Virtual mailboxes config | 293 | ### Virtual mailboxes config |
294 | 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_alias_maps = [ |
295 | "hash:/etc/postfix/virtual" | ||
296 | "mysql:${config.secrets.fullPaths."postfix/mysql_alias_maps"}" | ||
297 | "ldap:${config.secrets.fullPaths."postfix/ldap_ejabberd_users_immae_fr"}" | ||
298 | ]; | ||
295 | virtual_mailbox_domains = config.myEnv.mail.postfix.additional_mailbox_domains | 299 | virtual_mailbox_domains = config.myEnv.mail.postfix.additional_mailbox_domains |
296 | ++ lib.remove null (lib.flatten (map | 300 | ++ lib.remove null (lib.flatten (map |
297 | (zone: map | 301 | (zone: map |
@@ -303,7 +307,10 @@ | |||
303 | ) | 307 | ) |
304 | config.myEnv.dns.masterZones | 308 | config.myEnv.dns.masterZones |
305 | )); | 309 | )); |
306 | virtual_mailbox_maps = "hash:/etc/postfix/host_dummy_mailboxes mysql:${config.secrets.fullPaths."postfix/mysql_mailbox_maps"}"; | 310 | virtual_mailbox_maps = [ |
311 | "hash:/etc/postfix/host_dummy_mailboxes" | ||
312 | "mysql:${config.secrets.fullPaths."postfix/mysql_mailbox_maps"}" | ||
313 | ]; | ||
307 | dovecot_destination_recipient_limit = "1"; | 314 | dovecot_destination_recipient_limit = "1"; |
308 | virtual_transport = "dovecot"; | 315 | virtual_transport = "dovecot"; |
309 | 316 | ||