From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 8 Aug 2010 03:53:32 +0000 (-0300)
Subject: Moving postfixadmin variables to system.pp
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f9b0480e5bd251275325a0c317d910a8b531ebe7;p=puppet-mail.git

Moving postfixadmin variables to system.pp
---

diff --git a/manifests/postfixadmin.pp b/manifests/postfixadmin.pp
index d410539..e1ab73b 100644
--- a/manifests/postfixadmin.pp
+++ b/manifests/postfixadmin.pp
@@ -2,22 +2,6 @@ class mail::postfixadmin {
   #
   # Database configuration
   #
-  case $postfixadmin_password {
-    '': { fail("You need to define \$postfixadmin_password host config") }
-  }
-
-  case $postfixadmin_user {
-    '': { $postfixadmin_user = "postfix" }
-  }
-
-  case $postfixadmin_hosts {
-    '': { $postfixadmin_hosts = "localhost" }
-  }
-
-  case $postfixadmin_dbname {
-    '': { $postfixadmin_dbname= "postfix" }
-  }
-
   database::instance { "$postfixadmin_dbname":
     password => "$postfixadmin_password",
   }
diff --git a/manifests/system.pp b/manifests/system.pp
index 1c2a4d5..b6db2d2 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -7,6 +7,22 @@ class mail::system {
     '': { $postfix_mynetworks = "127.0.0.0/8" }
   }
 
+  case $postfixadmin_password {
+    '': { fail("You need to define \$postfixadmin_password host config") }
+  }
+
+  case $postfixadmin_user {
+    '': { $postfixadmin_user = "postfix" }
+  }
+
+  case $postfixadmin_hosts {
+    '': { $postfixadmin_hosts = "localhost" }
+  }
+
+  case $postfixadmin_dbname {
+    '': { $postfixadmin_dbname= "postfix" }
+  }
+
   # Module requirements
   include postfix
   include database