From 86515e9a0f27d36e38faee05beb03cbb99677e73 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 21 Jan 2013 18:01:00 -0200
Subject: Refactoring for 2.7 compatibility

---
 manifests/virtual.pp | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

(limited to 'manifests/virtual.pp')

diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index c895777..d351209 100644
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -1,35 +1,11 @@
 class mail::virtual {
-  # Class configuration
-  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" }
-  }
-
   # Virtual subsystems
   include database
   include mail::packages::virtual
   include mail::sasl
   include mail::dovecot
-  include mail::postfixadmin
-  include mail::web::virtual
+
+  class { [ 'mail::postfixadmin', 'mail::web::virtual' }
 
   # Virtual mailboxes
   file { '/var/mail/virtual':
-- 
cgit v1.2.3