diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-08-30 15:09:23 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-08-30 15:09:23 -0300 |
| commit | bd9b8d57318420db58d9042e88d08a24a8b7691b (patch) | |
| tree | ff0617c8feff161a50cd2253b217266dd7a73929 /manifests/system.pp | |
| parent | 86dfb7091fff032575cf322ab9f6132e4be49cdb (diff) | |
| download | puppet-mail-bd9b8d57318420db58d9042e88d08a24a8b7691b.tar.gz puppet-mail-bd9b8d57318420db58d9042e88d08a24a8b7691b.tar.bz2 | |
Fixing mydestination and adding sympa disable classes
Diffstat (limited to 'manifests/system.pp')
| -rw-r--r-- | manifests/system.pp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/manifests/system.pp b/manifests/system.pp index 5207f4d..35cb2b9 100644 --- a/manifests/system.pp +++ b/manifests/system.pp @@ -10,6 +10,10 @@ class mail::system { '': { $postfix_mynetworks = "127.0.0.0/8" } } + case $sympa_subdomain { + '': { $sympa_subdomain = "lists" } + } + # Module requirements include postfix include ssl::mail @@ -34,13 +38,12 @@ class mail::system { # Sympa mailing list manager case $mail_sympa { true: { - case $sympa_subdomain { - '': { $sympa_subdomain = "lists" } - } - - $sympa_mydestination = "${sympa_subdomain}.${domain}" + $sympa_mydestination = ", ${sympa_subdomain}.${domain}" include mail::sympa } + 'disabled': { + include mail::sympa::disabled + } default: { include mail::regexps } @@ -53,13 +56,13 @@ class mail::system { '': { $schleuder_subdomain = "encrypted" } } - $schleuder_mydestination = "${schleuder_subdomain}.${domain}" + $schleuder_mydestination = ", ${schleuder_subdomain}.${domain}" include mail::schleuder } } case $postfix_mydestination { - '': { $postfix_mydestination = "${postfix_my_defaultdestination} ${sympa_mydestination} ${schleuder_mydestination}" } + '': { $postfix_mydestination = "${postfix_my_defaultdestination}${sympa_mydestination}${schleuder_mydestination}" } } # Include base configuration |