1 files changed, 14 insertions, 57 deletions

diff --git a/manifests/system.pp b/manifests/system.pp
index 53ec12f..e48f52e 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -10,84 +10,41 @@ class mail::system {
     '': { $postfix_mynetworks = "127.0.0.0/8" }
   }
 
-  case $postfixadmin_database_password {
-    '': { fail("You need to define \$postfixadmin_database_password host config") }
-  }
-
-  case $postfixadmin_setup_hash {
-    '': {
-      warning("You need to define \$postfixadmin_setup_hash host config")
-      $postfixadmin_setup_hash = 'changeme'
-    }
-  }
-
-  case $postfixadmin_database_user {
-    '': { $postfixadmin_database_user = "postfix" }
-  }
-
-  case $postfixadmin_database_host {
-    '': { $postfixadmin_database_host = "localhost" }
-  }
-
-  case $postfixadmin_database_name {
-    '': { $postfixadmin_database_name= "postfix" }
-  }
-
   # Module requirements
   include postfix
-  include database
   include ssl::mail
 
-  # Subsystems
+  # Common subsystems
   include mail::packages
   include mail::base
-  include mail::sasl
   include mail::tls
-  include mail::dovecot
   include mail::amavisd
   include mail::header_checks
-  include mail::postfixadmin
-  include mail::web
   include mail::clamav
 
+  # Virtual mail system
+  case $mail_virtual {
+    true: {
+      include mail::virtual
+    }
+    default: {
+      include mail::regular
+    }
+  }
+
   # Sympa mailing list manager
   case $mail_sympa {
     true: {
-
-      case $sympa_database_password {
-        '': { fail("You need to define \$sympa_database_password host config") }
-      }
-
-      case $sympa_database_name {
-        '': { $sympa_database_name= "sympa" }
-      }
-
-      case $sympa_database_host {
-        '': { $sympa_database_host = "localhost" }
-      }
-
-      case $sympa_subdomain {
-        '': { $sympa_subdomain = "lists" }
-      }
-
-      case $sympa_listmasters {
-        '': { $sympa_listmasters = "listmaster@${fqdn}" }
-      }
-
-      case $sympa_lang {
-        '': { $sympa_lang = "en_US" }
-      }
-
       include mail::sympa
-      include mail::web::sympa
-      include mail::packages::sympa
+    }
+    default: {
+      include mail::regexps
     }
   }
 
   # Schleuder mailing list manager
   case $mail_schleuder {
     true: {
-      include mail::packages::schleuder
       include mail::schleuder
     }
   }