From 2f8d0729c07976f77f2d54b45cfb0bb43c5999e1 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Wed, 6 Apr 2016 21:38:54 +0200 Subject: [PATCH] Allow more virtual postfix domains and make aliases configurable. --- group_vars/all | 11 +++++++++++ roles/mail/templates/postfix/main.cf.j2 | 5 ++++- roles/mail/templates/postfix/virtual-alias.j2 | 5 ++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/group_vars/all b/group_vars/all index 333dc4a..ba9342f 100644 --- a/group_vars/all +++ b/group_vars/all @@ -10,8 +10,19 @@ ldap_binddn: cn=Services,ou=roles,dc=binary-kitchen,dc=de ldap_bindpw: svcpwd mail_domain: binary-kitchen.de +mail_domains: +- ccc-r.de +- ccc-regensburg.de mail_server: mail.binary-kitchen.de mailman_domain: lists.binary-kitchen.de +mail_aliases: +- "info@binary-kitchen.de vorstand@binary-kitchen.de" +- "lebercast@binary-kitchen.de anti@binary-kitchen.de,dragonchaser@binary-kitchen.de,moepman@binary-kitchen.de,philmacfly@binary-kitchen.de,ralf@binary-kitchen.de" +- "mayday@binary-kitchen.de anti@binary-kitchen.de" +- "sysadmin.mail@binary-kitchen.de moepman@binary-kitchen.de" +- "vorstand@binary-kitchen.de anti@binary-kitchen.de,moepman@binary-kitchen.de,philmacfly@binary-kitchen.de" +- "orga@ccc-r.de orga@ccc-regensburg.de" +- "orga@ccc-regensburg.de anti@binary-kitchen.de" nslcd_base_group: ou=groups,dc=binary-kitchen,dc=de nslcd_base_shadow: ou=people,dc=binary-kitchen,dc=de diff --git a/roles/mail/templates/postfix/main.cf.j2 b/roles/mail/templates/postfix/main.cf.j2 index 3efc3ce..ec6060c 100644 --- a/roles/mail/templates/postfix/main.cf.j2 +++ b/roles/mail/templates/postfix/main.cf.j2 @@ -74,9 +74,12 @@ content_filter = amavis:[127.0.0.1]:10024 receive_override_options = no_address_mappings virtual_mailbox_domains = {{ mail_domain }} +{%- for domain in mail_domains %} + {{ domain }} +{%- endfor %} + virtual_mailbox_maps = ldap:/etc/postfix/ldap-virtual-maps.cf virtual_alias_maps = hash:/etc/postfix/virtual-alias, ldap:/etc/postfix/ldap-aliases.cf -#virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, hash:/etc/postfix/virtual-alias, ldap:/etc/postfix/ldap-aliases.cf virtual_transport = dovecot dovecot_destination_recipient_limit = 1 diff --git a/roles/mail/templates/postfix/virtual-alias.j2 b/roles/mail/templates/postfix/virtual-alias.j2 index 6a26231..ed9beb6 100644 --- a/roles/mail/templates/postfix/virtual-alias.j2 +++ b/roles/mail/templates/postfix/virtual-alias.j2 @@ -1 +1,4 @@ -amavis@{{ mail_domain }} root@{{ mail_domain }} +amavis@{{ mail_domain }} sysadmin.mail@{{ mail_domain }} +{% for alias in mail_aliases %} +{{ alias }} +{% endfor %}