diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-22 16:37:55 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-22 16:37:55 -0200 |
| commit | f356f8e0789a65cf51d3458f547874b1d7992ed3 (patch) | |
| tree | 0651a57f11d40dcda8b8ac110bce6075a3e3e211 | |
| parent | 15eeebf883a96bcd69bb1d36a9bc54866d281823 (diff) | |
| download | puppet-mail-f356f8e0789a65cf51d3458f547874b1d7992ed3.tar.gz puppet-mail-f356f8e0789a65cf51d3458f547874b1d7992ed3.tar.bz2 | |
Include default virtual parameters (2)
| -rw-r--r-- | manifests/system.pp | 2 | ||||
| -rw-r--r-- | manifests/virtual.pp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/manifests/system.pp b/manifests/system.pp index bf57896..8d665f2 100644 --- 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 956b34a..a88ea55 100644 --- 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 { |