Adding default parameters into classes

13 files changed, 55 insertions, 20 deletions

diff --git a/manifests/firma.pp b/manifests/firma.pp
index a832878..0d4ea84 100644
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -1,5 +1,5 @@
 class mail::firma(
-  $subdomain = hiera('firma_subdomain', 'firma')
+  $subdomain = hiera('firma_subdomain', $firma::params::subdomain)
 ) {
 
   # Firma subsystems
diff --git a/manifests/firma/params.pp b/manifests/firma/params.pp
new file mode 100644
index 0000000..22bc678
--- /dev/null
+++ b/manifests/firma/params.pp
@@ -0,0 +1,3 @@
+class mail::firma::params {
+  $subdomain = 'firma'
+}
diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp
index 0a98d6e..dcb6d2f 100644
--- a/manifests/mlmmj.pp
+++ b/manifests/mlmmj.pp
@@ -1,5 +1,5 @@
 class mail::mlmmj(
-  $subdomain = hiera('mail::mlmmj::subdomain', 'mlmmj')
+  $subdomain = hiera('mail::mlmmj::subdomain', $mail::mlmmj::params::subdomain)
 ) {
 
   include mail::mlmmj::packages
diff --git a/manifests/mlmmj/params.pp b/manifests/mlmmj/params.pp
new file mode 100644
index 0000000..ed77f69
--- /dev/null
+++ b/manifests/mlmmj/params.pp
@@ -0,0 +1,3 @@
+class mail:mlmmj::params {
+  $subdomain = 'mlmmj'
+}
diff --git a/manifests/schleuder.pp b/manifests/schleuder.pp
index 1f42fcd..5f9e261 100644
--- a/manifests/schleuder.pp
+++ b/manifests/schleuder.pp
@@ -1,5 +1,5 @@
 class mail::schleuder(
-  $subdomain = hiera('schleuder_subdomain', 'encrypted')
+  $subdomain = hiera('schleuder_subdomain', $mail::schleuder::params::subdomain)
 ) {
 
   # Schleuder subsystems
diff --git a/manifests/schleuder/params.pp b/manifests/schleuder/params.pp
new file mode 100644
index 0000000..afe2b77
--- /dev/null
+++ b/manifests/schleuder/params.pp
@@ -0,0 +1,3 @@
+class mail::schleuder::params {
+  $subdomain = 'encrypted'
+}
diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 9145a69..4ba528a 100644
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -1,11 +1,11 @@
 class mail::sympa(
-  $database_password = hiera('mail::sympa::database_password', ''),
-  $database_name = hiera('mail::sympa::database_name', 'sympa'),
-  $database_host = hiera('mail::sympa::database_host', 'localhost'),
-  $listmasters = hiera('mail::sympa::listmasters', "listmaster@${fqdn}"),
-  $lang = hiera('mail::sympa::lang', 'en_US'),
-  $subdomain = hiera('mail::sympa::subdomain', 'lists'),
-  $logo_html_definition = hiera('mail::sympa::logo_html_definition', '')
+  $database_password    = hiera('mail::sympa::database_password',    ''),
+  $database_name        = hiera('mail::sympa::database_name',        $mail::sympa::params::database_name),
+  $database_host        = hiera('mail::sympa::database_host',        $mail::sympa::params::database_host),
+  $listmasters          = hiera('mail::sympa::listmasters',          $mail::sympa::params::listmasters),
+  $lang                 = hiera('mail::sympa::lang',                 $mail::sympa::params::lang),
+  $subdomain            = hiera('mail::sympa::subdomain',            $mail::sympa::params::subdomain),
+  $logo_html_definition = hiera('mail::sympa::logo_html_definition', $mail::sympa::params::logo_html_definition)
 ) {
 
   # Class configuration
diff --git a/manifests/sympa/params.pp b/manifests/sympa/params.pp
new file mode 100644
index 0000000..79a4528
--- /dev/null
+++ b/manifests/sympa/params.pp
@@ -0,0 +1,8 @@
+class mail::sympa::params {
+  $database_name        = 'sympa'
+  $database_host        = 'localhost'
+  $listmasters          = "listmaster@${fqdn}"
+  $lang                 = 'en_US'
+  $subdomain            = 'lists'
+  $logo_html_definition = ''
+}
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
diff --git a/manifests/system/params.pp b/manifests/system/params.pp
new file mode 100644
index 0000000..b5ce4e9
--- /dev/null
+++ b/manifests/system/params.pp
@@ -0,0 +1,4 @@
+class mail::system::params {
+  $postfix_mynetworks        = "127.0.0.0/8"
+  $postfix_manage_tls_policy = 'no'
+}
diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index 129c998..b212d58 100644
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -1,7 +1,7 @@
 class mail::virtual(
-  $database_user     = hiera('mail::virtual::database_user', $mail::virtual::params::database_user),
-  $database_host     = hiera('mail::virtual::database_host', $mail::virtual::params::database_host),
-  $database_name     = hiera('mail::virtual::database_name', $mail::virtual::params::database_name),
+  $database_user     = hiera('mail::virtual::database_user',     $mail::virtual::params::database_user),
+  $database_host     = hiera('mail::virtual::database_host',     $mail::virtual::params::database_host),
+  $database_name     = hiera('mail::virtual::database_name',     $mail::virtual::params::database_name),
   $database_password = hiera('mail::virtual::database_password', ''),
 ) {
 
diff --git a/manifests/virtual/web.pp b/manifests/virtual/web.pp
index bf826ef..3491839 100644
--- a/manifests/virtual/web.pp
+++ b/manifests/virtual/web.pp
@@ -1,8 +1,8 @@
 class mail::virtual::web(
-  $postfixadmin_setup_hash = hiera('mail::virtual::web::postfixadmin_setup_hash', ''),
-  $roundcube_des_key = hiera('mail::virtual::web::roundcube_des_key', ''),
-  $roundcube_logo = hiera('mail::virtual::web::roundcube_logo', 'null'),
-  $roundcube_login_info = hiera('mail::virtual::web::roundcube_login_info', false)
+  $postfixadmin_setup_hash = hiera('mail::virtual::web::postfixadmin_setup_hash', $mail::virtual::web::params::postfixadmin_setup_hash),
+  $roundcube_des_key       = hiera('mail::virtual::web::roundcube_des_key',       $mail::virtual::web::params::roundcube_des_key),
+  $roundcube_logo          = hiera('mail::virtual::web::roundcube_logo',          $mail::virtual::web::params::roundcube_logo),
+  $roundcube_login_info    = hiera('mail::virtual::web::roundcube_login_info',    $mail::virtual::web::params::roundcube_login_info)
 ) {
 
   # Class configuration
diff --git a/manifests/virtual/web/params.pp b/manifests/virtual/web/params.pp
new file mode 100644
index 0000000..c6ae14c
--- /dev/null
+++ b/manifests/virtual/web/params.pp
@@ -0,0 +1,6 @@
+class mail::virtual::web::params {
+  $postfixadmin_setup_hash = ''
+  $roundcube_des_key       = ''
+  $roundcube_logo          = 'null'
+  $roundcube_login_info    = false
+}