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

diff --git a/manifests/postfixadmin.pp b/manifests/postfixadmin.pp
index e00d8ce33b3980ad9a427f58c5dcb25fcc0de3cc..b9745156c5536d7ee4cabf287462100b066a50c9 100644 (file)
--- 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 5035c77be02371a71c022ce828963e35002a885a..c8957774ebe4502fbed57fc3d5a3029c6c4cff0b 100644 (file)
--- 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