Include default virtual parameters (2)

diff --git a/manifests/system.pp b/manifests/system.pp
index bf57896b8099b5e02c7678ec724ff79f9606fb79..8d665f29792cf3dc84ac829581edd6a954e9aa1d 100644 (file)
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -35,7 +35,7 @@ class mail::system {
   # Virtual mail system
   case hiera('mail::virtual', false) {
     true: {
-      class { 'mail::virtual': }
+      class { [ 'mail::virtual::params', 'mail::virtual' ]: }
     }
     default: {
       include mail::regular

diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index 956b34ac0e6fd0ceeaeea4affc2d8216cae2e268..a88ea5515d66924b2dbb99bf59091d82b35fe8f4 100644 (file)
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -4,8 +4,6 @@ class mail::virtual(
   $database_name     = hiera('mail::virtual::database_name', $mail::virtual::params::database_name),
   $database_password = hiera('mail::virtual::database_password', ''),
 ) {
-  # Default parameters
-  include mail::virtual::params
 
   # Check parameters
   case $database_password {