diff options
Diffstat (limited to 'modules/postfix')
| -rw-r--r-- | modules/postfix/manifests/server/primary.pp | 2 | ||||
| -rw-r--r-- | modules/postfix/templates/main.cf | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/modules/postfix/manifests/server/primary.pp b/modules/postfix/manifests/server/primary.pp index e9480b10..bd24a366 100644 --- a/modules/postfix/manifests/server/primary.pp +++ b/modules/postfix/manifests/server/primary.pp @@ -2,7 +2,7 @@ class postfix::server::primary inherits postfix::server { # Adding DKIM server include opendkim - opendkim::domain{['mageia.org']:} + opendkim::domain{['mageia.org', 'sucuk.mageia.org', 'duvel.mageia.org', 'forums.mageia.org', 'madb.mageia.org','rabbit.mageia.org', 'fiona.mageia.org','identity.mageia.org']:} opendkim::trusted{['127.0.0.0/8', '212.85.158.0/24']:} package { 'postfix-ldap': } diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf index 1d0658fc..55482540 100644 --- a/modules/postfix/templates/main.cf +++ b/modules/postfix/templates/main.cf @@ -77,9 +77,6 @@ alias_maps = hash:/etc/postfix/aliases virtual_alias_maps = ldap:/etc/postfix/ldap_aliases.conf ldap:/etc/postfix/group_aliases.conf hash:/etc/postfix/virtual_aliases - - - <%- if classes.include?('sympa::server') -%> regexp:/etc/postfix/sympa_aliases <%- end -%> @@ -96,8 +93,8 @@ milter_default_action = accept milter_protocol = 2 # Adding Sender Rewriting Scheme -sender_canonical_maps = tcp:localhost:10003 -sender_canonical_classes = envelope_sender +#sender_canonical_maps = tcp:localhost:10003 +i#sender_canonical_classes = envelope_sender #recipient_canonical_maps = tcp:localhost:10002 #recipient_canonical_classes= envelope_recipient,header_recipient |