diff options
Diffstat (limited to 'manifests/system.pp')
-rw-r--r-- | manifests/system.pp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/manifests/system.pp b/manifests/system.pp index 35cb2b9..6cf759a 100644 --- a/manifests/system.pp +++ b/manifests/system.pp @@ -4,7 +4,8 @@ class mail::system { $postfix_use_dovecot_lda = "yes" $postfix_use_schleuder = "yes" $postfix_use_sympa = "yes" - $postfix_my_defaultdestination = '$myhostname, localhost.$mydomain, localhost' + $postfix_mydestination = '$myhostname, localhost.$mydomain, localhost' + $postfix_default_relay_domains = '$mydestination' case $postfix_mynetworks { '': { $postfix_mynetworks = "127.0.0.0/8" } @@ -38,7 +39,7 @@ class mail::system { # Sympa mailing list manager case $mail_sympa { true: { - $sympa_mydestination = ", ${sympa_subdomain}.${domain}" + $sympa_relaydomains = ", ${sympa_subdomain}.${domain}" include mail::sympa } 'disabled': { @@ -56,13 +57,13 @@ class mail::system { '': { $schleuder_subdomain = "encrypted" } } - $schleuder_mydestination = ", ${schleuder_subdomain}.${domain}" + $schleuder_relaydomains = ", ${schleuder_subdomain}.${domain}" include mail::schleuder } } - case $postfix_mydestination { - '': { $postfix_mydestination = "${postfix_my_defaultdestination}${sympa_mydestination}${schleuder_mydestination}" } + case $postfix_relay_domains { + '': { $postfix_relay_domains = "${postfix_default_relay_domains}${sympa_relay_domains}${schleuder_relay_domains}" } } # Include base configuration |