summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-06-29 00:30:31 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:52:06 +0200
commit898b2aa04d25ef237ffc5e26da8a206022bdc3fa (patch)
treed48f2be5b80a6a47fb0bd1c4ae81fa25c3c59bf2
parentebab80fc4e8e1999833f9295649766133eb4d6fa (diff)
Don't use generic maps.
In fact we want to only rewrite the envelope sender: :/etc/postfix/main.cf # Overwrite local FQDN envelope sender addresses sender_canonical_classes = envelope_sender propagate_unmatched_extensions = sender_canonical_maps = cdb:$config_directory/sender_canonical :/etc/postfix/sender_canonical @elefant.fripost.org admin@fripost.org However, when canonical(5) processes a mail sent vias sendmail(1), it rewrites the envelope sender which seems to *later* be use as From: header.
-rw-r--r--roles/common/files/etc/postfix/generic.pcre3
-rw-r--r--roles/common/tasks/mail.yml8
-rw-r--r--roles/common/templates/etc/postfix/main.cf.j23
3 files changed, 2 insertions, 12 deletions
diff --git a/roles/common/files/etc/postfix/generic.pcre b/roles/common/files/etc/postfix/generic.pcre
deleted file mode 100644
index 1181a22..0000000
--- a/roles/common/files/etc/postfix/generic.pcre
+++ /dev/null
@@ -1,3 +0,0 @@
-# Rewrite the whole enveloppe (From: & To: included) to somthing
-# routable on the internet.
-/^(.+)@([^@.]+)\.[^@]+$/ admin+${1}=${2}@fripost.org
diff --git a/roles/common/tasks/mail.yml b/roles/common/tasks/mail.yml
index e8d61a8..8572784 100644
--- a/roles/common/tasks/mail.yml
+++ b/roles/common/tasks/mail.yml
@@ -5,7 +5,6 @@
- heirloom-mailx
- postfix
- postfix-cdb
- - postfix-pcre
- name: Create Postfix instances
postmulti: instance={{ postfix_instance[item].name }}
@@ -29,13 +28,10 @@
- Restart Postfix
- name: Configure Postfix (1)
- copy: src=etc/postfix/{{ item }}
- dest=/etc/postfix/{{ item }}
+ copy: src=etc/postfix/master.cf
+ dest=/etc/postfix/master.cf
owner=root group=root
mode=0644
- with_items:
- - master.cf
- - generic.pcre
notify:
- Reload Postfix
diff --git a/roles/common/templates/etc/postfix/main.cf.j2 b/roles/common/templates/etc/postfix/main.cf.j2
index 169ad40..e594c1e 100644
--- a/roles/common/templates/etc/postfix/main.cf.j2
+++ b/roles/common/templates/etc/postfix/main.cf.j2
@@ -30,9 +30,6 @@ default_database_type = cdb
virtual_alias_maps = cdb:/etc/aliases
alias_database = $virtual_alias_maps
-# Transform local FQDN addresses to addresses routable on the internet
-smtp_generic_maps = pcre:$config_directory/generic.pcre
-
# Forward everything to our internal mailhub
{% if 'MTA-out' in group_names %}
relayhost = [127.0.0.1]:{{ postfix_instance["MTA-out"].port }}