diff options
Diffstat (limited to 'manifests/system.pp')
-rw-r--r-- | manifests/system.pp | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/manifests/system.pp b/manifests/system.pp index 5b08c83..5207f4d 100644 --- a/manifests/system.pp +++ b/manifests/system.pp @@ -1,13 +1,10 @@ class mail::system { - $postfix_smtp_listen = "all" - $postfix_use_amavisd = "yes" - $postfix_use_dovecot_lda = "yes" - $postfix_use_schleuder = "yes" - $postfix_use_sympa = "yes" - - case $postfix_mydestination { - '': { $postfix_mydestination = '$myhostname, localhost.$mydomain, localhost' } - } + $postfix_smtp_listen = "all" + $postfix_use_amavisd = "yes" + $postfix_use_dovecot_lda = "yes" + $postfix_use_schleuder = "yes" + $postfix_use_sympa = "yes" + $postfix_my_defaultdestination = '$myhostname, localhost.$mydomain, localhost' case $postfix_mynetworks { '': { $postfix_mynetworks = "127.0.0.0/8" } @@ -19,7 +16,6 @@ class mail::system { # Common subsystems include mail::packages - include mail::base include mail::tls include mail::amavisd include mail::header_checks @@ -38,6 +34,11 @@ class mail::system { # Sympa mailing list manager case $mail_sympa { true: { + case $sympa_subdomain { + '': { $sympa_subdomain = "lists" } + } + + $sympa_mydestination = "${sympa_subdomain}.${domain}" include mail::sympa } default: { @@ -48,7 +49,19 @@ class mail::system { # Schleuder mailing list manager case $mail_schleuder { true: { + case $schleuder_subdomain { + '': { $schleuder_subdomain = "encrypted" } + } + + $schleuder_mydestination = "${schleuder_subdomain}.${domain}" include mail::schleuder } } + + case $postfix_mydestination { + '': { $postfix_mydestination = "${postfix_my_defaultdestination} ${sympa_mydestination} ${schleuder_mydestination}" } + } + + # Include base configuration + include mail::base } |