From 0853c2afdc2ddba11692ef17bb859104d47071e0 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Tue, 14 Jan 2014 05:58:33 +0100 Subject: Fix catchall resolution. It has to be performed last, to give a chance to be accepted as a regular mailbox. We introduce a new, dedicated, smtpd daemon whose only purpose is to resolve catch-alls. --- roles/MX/files/etc/postfix/virtual/alias_catchall_maps.cf | 7 ------- roles/MX/files/etc/postfix/virtual/alias_maps.cf | 6 ------ roles/MX/files/etc/postfix/virtual/mailbox_domains.cf | 8 -------- roles/MX/files/etc/postfix/virtual/mailbox_maps.cf | 8 -------- roles/MX/files/etc/postfix/virtual/reserved_maps.pcre | 5 ----- roles/MX/files/etc/postfix/virtual/reserved_transport_maps | 2 -- roles/MX/files/etc/postfix/virtual/transport_lists_maps.cf | 11 ----------- 7 files changed, 47 deletions(-) delete mode 100644 roles/MX/files/etc/postfix/virtual/alias_catchall_maps.cf delete mode 100644 roles/MX/files/etc/postfix/virtual/alias_maps.cf delete mode 100644 roles/MX/files/etc/postfix/virtual/mailbox_domains.cf delete mode 100644 roles/MX/files/etc/postfix/virtual/mailbox_maps.cf delete mode 100644 roles/MX/files/etc/postfix/virtual/reserved_maps.pcre delete mode 100644 roles/MX/files/etc/postfix/virtual/reserved_transport_maps delete mode 100644 roles/MX/files/etc/postfix/virtual/transport_lists_maps.cf (limited to 'roles/MX/files/etc/postfix') diff --git a/roles/MX/files/etc/postfix/virtual/alias_catchall_maps.cf b/roles/MX/files/etc/postfix/virtual/alias_catchall_maps.cf deleted file mode 100644 index f8324f6..0000000 --- a/roles/MX/files/etc/postfix/virtual/alias_catchall_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -server_host = ldapi://%2Fprivate%2Fldapi/ -version = 3 -search_base = fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org -scope = base -bind = none -query_filter = (&(objectClass=FripostVirtualDomain)(fvd=%d)(fripostOptionalMaildrop=*)) -result_attribute = fripostOptionalMaildrop diff --git a/roles/MX/files/etc/postfix/virtual/alias_maps.cf b/roles/MX/files/etc/postfix/virtual/alias_maps.cf deleted file mode 100644 index 8e3a778..0000000 --- a/roles/MX/files/etc/postfix/virtual/alias_maps.cf +++ /dev/null @@ -1,6 +0,0 @@ -server_host = ldapi://%2Fprivate%2Fldapi/ -version = 3 -search_base = fvl=%u,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org -scope = base -query_filter = (&(objectClass=FripostVirtualAlias)(fvl=%u)) -result_attribute = fripostMaildrop diff --git a/roles/MX/files/etc/postfix/virtual/mailbox_domains.cf b/roles/MX/files/etc/postfix/virtual/mailbox_domains.cf deleted file mode 100644 index 74304a4..0000000 --- a/roles/MX/files/etc/postfix/virtual/mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -server_host = ldapi://%2Fprivate%2Fldapi/ -version = 3 -search_base = fvd=%s,ou=virtual,o=mailHosting,dc=fripost,dc=org -scope = base -bind = none -query_filter = (&(objectClass=FripostVirtualDomain)(fvd=%s)) -result_attribute = fvd -result_format = OK diff --git a/roles/MX/files/etc/postfix/virtual/mailbox_maps.cf b/roles/MX/files/etc/postfix/virtual/mailbox_maps.cf deleted file mode 100644 index da1b2cf..0000000 --- a/roles/MX/files/etc/postfix/virtual/mailbox_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -server_host = ldapi://%2Fprivate%2Fldapi/ -version = 3 -search_base = fvl=%u,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org -scope = base -bind = none -query_filter = (&(objectClass=FripostVirtualUser)(fvl=%u)) -result_attribute = fvl -result_format = OK diff --git a/roles/MX/files/etc/postfix/virtual/reserved_maps.pcre b/roles/MX/files/etc/postfix/virtual/reserved_maps.pcre deleted file mode 100644 index 58572d1..0000000 --- a/roles/MX/files/etc/postfix/virtual/reserved_maps.pcre +++ /dev/null @@ -1,5 +0,0 @@ -# These reserved aliases will always be redirected to us and the domain -# owner. -# TODO: check 'postmaster+test@fripost.org' -/^(?:postmaster|abuse)(?:\+.*)?@fripost\.org$/ admin@fripost.org -/^((?:postmaster|abuse)(?:\+.*)?)@/ $1 diff --git a/roles/MX/files/etc/postfix/virtual/reserved_transport_maps b/roles/MX/files/etc/postfix/virtual/reserved_transport_maps deleted file mode 100644 index dce8710..0000000 --- a/roles/MX/files/etc/postfix/virtual/reserved_transport_maps +++ /dev/null @@ -1,2 +0,0 @@ -abuse reserved-alias: -postmaster reserved-alias: diff --git a/roles/MX/files/etc/postfix/virtual/transport_lists_maps.cf b/roles/MX/files/etc/postfix/virtual/transport_lists_maps.cf deleted file mode 100644 index 27c93d1..0000000 --- a/roles/MX/files/etc/postfix/virtual/transport_lists_maps.cf +++ /dev/null @@ -1,11 +0,0 @@ -server_host = ldapi://%2Fprivate%2Fldapi/ -version = 3 -search_base = fvl=%u,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org -scope = base -bind = none -query_filter = (&(|(objectClass=FripostVirtualList)(objectClass=FripostVirtualListCommand))(fvl=%u)) -result_attribute = fvl -# We use these maps for both virtual mailboxes and transport (in the -# former case the result is ignored, only the existence of a match -# matters.) -result_format = smtp:[127.0.0.1]:2345 -- cgit v1.2.3