Introducing schleuder_subdomain; postfix_mydestination now has sympa_mydestination...

diff --git a/manifests/schleuder.pp b/manifests/schleuder.pp
index ae51c9cddd6186c40a0543498d4b47296cd52d72..1be2f7ab8d8a84cf4bfd25137d5274d4cef1659d 100644 (file)
--- a/manifests/schleuder.pp
+++ b/manifests/schleuder.pp
@@ -4,7 +4,7 @@ class mail::schleuder {
 
   postfix::config { "schleuder_destination_recipient_limit": value => '1' }
 
-  postfix::transport { "encrypted.$domain":
+  postfix::transport { "${schleuder_subdomain}.$domain":
     ensure      => present,
     destination => "schleuder",
   }

diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 42b34f8b1b4a0e3f188f4c506fbfc31d9d0d6006..e526f7a30110f6df3c90b131901012036afe36ef 100644 (file)
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -16,10 +16,6 @@ class mail::sympa inherits mail::regexps {
     '': { $sympa_database_host = "localhost" }
   }
 
-  case $sympa_subdomain {
-    '': { $sympa_subdomain = "lists" }
-  }
-
   case $sympa_listmasters {
     '': { $sympa_listmasters = "listmaster@${fqdn}" }
   }

diff --git a/manifests/system.pp b/manifests/system.pp
index 5b08c835f58dfc257c52a8886c4de923944b965c..5207f4d125d80b3ea5ade87e9fc2bd3755076c93 100644 (file)
--- 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
 }