diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-22 17:42:26 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-22 17:42:26 -0200 |
| commit | c0024c4eb335f4b2406662586c1f69617f79ce8b (patch) | |
| tree | 4da895b48c857a78751e9b35d9a0a3bb2ef57789 /manifests/system.pp | |
| parent | 7e8504abeef5559dd1bcda3114e21906c0b3b4ab (diff) | |
| download | puppet-mail-c0024c4eb335f4b2406662586c1f69617f79ce8b.tar.gz puppet-mail-c0024c4eb335f4b2406662586c1f69617f79ce8b.tar.bz2 | |
Adding default parameters into classes
Diffstat (limited to 'manifests/system.pp')
| -rw-r--r-- | manifests/system.pp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/manifests/system.pp b/manifests/system.pp index 8d665f2..5347695 100644 --- a/manifests/system.pp +++ b/manifests/system.pp @@ -13,8 +13,8 @@ class mail::system { $postfix_manage_virtual_regexp = "yes" $postfix_mydestination = '$myhostname, localhost.$mydomain, localhost' $postfix_default_relay_domains = '$mydestination' - $postfix_mynetworks = hiera('postfix_mynetworks', "127.0.0.0/8") - $postfix_manage_tls_policy = hiera('postfix_manage_tls_policy', 'no') + $postfix_mynetworks = hiera('mail::postfix_mynetworks', $mail::system::params::postfix_mynetworks) + $postfix_manage_tls_policy = hiera('mail::postfix_manage_tls_policy', $mail::system::params::postfix_manage_tls_policy) case $sympa_subdomain { '': { $sympa_subdomain = "lists" } @@ -32,10 +32,18 @@ class mail::system { include mail::clamav include mail::spamassassin + # Default parameters + include mail::firma::params + include mail::mlmmj::params + include mail::sympa::params + include mail::schleuder::params + include mail::virtual::params + include mail::virtual::web::params + # Virtual mail system case hiera('mail::virtual', false) { true: { - class { [ 'mail::virtual::params', 'mail::virtual' ]: } + class { 'mail::virtual': } } default: { include mail::regular |