aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-03-22 15:17:56 +0000
committerMichael Scherer <misc@mageia.org>2011-03-22 15:17:56 +0000
commit5086281539f67e317ffd8bf833fb5f847beb662a (patch)
tree8ce840193ae43c3a502937fb0845f1caee2a80da /modules
parent3ecd835287b6d85102ae71c4331b5db24a2c1ad4 (diff)
downloadpuppet-5086281539f67e317ffd8bf833fb5f847beb662a.tar
puppet-5086281539f67e317ffd8bf833fb5f847beb662a.tar.gz
puppet-5086281539f67e317ffd8bf833fb5f847beb662a.tar.bz2
puppet-5086281539f67e317ffd8bf833fb5f847beb662a.tar.xz
puppet-5086281539f67e317ffd8bf833fb5f847beb662a.zip
- use a virtual domain rather than a regular one, as this
prevent to limit aliases on the main domain ( ie, we want to avoid potential interferences with subdomain like ml )
Diffstat (limited to 'modules')
-rw-r--r--modules/postfix/templates/ldap_aliases.conf1
-rw-r--r--modules/postfix/templates/main.cf8
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/postfix/templates/ldap_aliases.conf b/modules/postfix/templates/ldap_aliases.conf
index 42d7dd69..81c86702 100644
--- a/modules/postfix/templates/ldap_aliases.conf
+++ b/modules/postfix/templates/ldap_aliases.conf
@@ -15,3 +15,4 @@ bind_pw = <%= ldap_password %>
# postfix complain on url
# warning: dict_ldap_open: URL scheme ldaps requires protocol version 3
version = 3
+domain = <%= domain %>
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf
index eee9c6ed..29491611 100644
--- a/modules/postfix/templates/main.cf
+++ b/modules/postfix/templates/main.cf
@@ -38,7 +38,8 @@ relay_domains = <%= domain %>, ml.<%= domain %>
mydestination = <%= fqdn %>
<%- if all_tags.include?('postfix::primary_smtp') -%>
- <%= domain %>,
+
+virtual_mailbox_domains = <%= domain %>
# local_recipient_maps is disabled, as we need to route all
# non local email to ryu as long as mageia ml are hosted
@@ -50,9 +51,8 @@ fallback_transport_maps = regexp:/etc/postfix/transport_regexp
alias_maps = hash:/etc/postfix/aliases
- # uncomment if we want to enable ldap based alias
- # and create the file
- ldap:/etc/postfix/ldap_aliases.conf
+
+virtual_alias_maps = ldap:/etc/postfix/ldap_aliases.conf
<%- end -%>