From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 26 Aug 2010 15:06:16 +0000 (-0300)
Subject: Moving parameters from mail::postfixadmin to mail::virtual
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d40ab8dae8691b7b3692d2bb748bff755937d490;p=puppet-mail.git

Moving parameters from mail::postfixadmin to mail::virtual
---

diff --git a/manifests/postfixadmin.pp b/manifests/postfixadmin.pp
index e00d8ce..b974515 100644
--- a/manifests/postfixadmin.pp
+++ b/manifests/postfixadmin.pp
@@ -1,28 +1,4 @@
 class mail::postfixadmin {
-  # 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" }
-  }
-
   #
   # Database configuration
   #
diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index 5035c77..c895777 100644
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -1,4 +1,28 @@
 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