Merge branch 'master' into feature-traefik

postfix/conf/main.cf

@@ -91,7 +91,8 @@ virtual_alias_maps = ${sql}sqlite-virtual_alias_maps.cf
 virtual_mailbox_domains = ${sql}sqlite-virtual_mailbox_domains.cf
 virtual_mailbox_maps = $virtual_alias_maps
 
-# Mails are forwarded to Dovecot for delivery
+# Mails are transported if required, then forwarded to Dovecot for delivery
+transport_maps = ${sql}sqlite-transport.cf
 virtual_transport = lmtp:inet:imap:2525
 
 # In order to prevent Postfix from running DNS query, enforce the use of the

postfix/conf/sqlite-transport.cf

@@ -0,0 +1,3 @@
+dbpath = /data/main.db
+query =
+  SELECT 'smtp:['||smtp||']' FROM relay WHERE name='%s'

postfix/conf/sqlite-virtual_alias_maps.cf

@@ -4,7 +4,9 @@ query =
    FROM
      (SELECT destination, email, wildcard, localpart FROM alias
       UNION
-      SELECT (CASE WHEN forward_enabled=1 THEN (CASE WHEN forward_keep=1 THEN email||',' ELSE '' END)||forward_destination ELSE email END) AS destination, email, 0 as wildcard, localpart FROM user)
+      SELECT (CASE WHEN forward_enabled=1 THEN (CASE WHEN forward_keep=1 THEN email||',' ELSE '' END)||forward_destination ELSE email END) AS destination, email, 0 as wildcard, localpart FROM user
+      UNION
+      SELECT '@'||domain_name as destination, '@'||name as email, 0 as wildcard, '' as localpart FROM alternative)
    WHERE
      (
       wildcard = 0

postfix/conf/sqlite-virtual_mailbox_domains.cf

@@ -1,2 +1,5 @@
 dbpath = /data/main.db
-query = SELECT name FROM domain WHERE name='%s'
+query =
+  SELECT name FROM domain WHERE name='%s'
+  UNION
+  SELECT name FROM alternative WHERE name='%s'