Moving postfixadmin variables to system.pp

diff --git a/manifests/postfixadmin.pp b/manifests/postfixadmin.pp
index d41053985026592ace4d1ba0481d4f7b44cc66c3..e1ab73b594222f0fe4a53a673d734167d49aa1f7 100644 (file)
--- 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 1c2a4d5a021b349a6c30c1b75f76b608fee8bf72..b6db2d2d4d394d64b1802c97e1119fafb7a38900 100644 (file)
--- 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