Remove mail::system::params

diff --git a/manifests/init.pp b/manifests/init.pp
index d30a0ac931fc0f99c43a0e494910e6bacb3bd1a4..2d951077e006fb2dc6ae3bf0ec4783aa78e880a5 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,5 +1,3 @@
 #
 # Mail module
 #
-
-include mail::system::params

diff --git a/manifests/system.pp b/manifests/system.pp
index ec17ac7d09ed2a9104154c6f06148595d9ec5283..7d347f048e75cef77c9633014129b820e9a2b79f 100644 (file)
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -1,7 +1,7 @@
 class mail::system(
   $mydestination       = hiera('mail::mydestination',       '$myhostname, localhost.$mydomain, localhost'),
   $relay_domains       = hiera('mail::relay_domains',       ''),
-  $mynetworks          = hiera('mail::postfix_mynetworks',  $mail::system::params::postfix_mynetworks),
+  $mynetworks          = hiera('mail::postfix_mynetworks',  "127.0.0.0/8"),
   $root_mail_recipient = hiera('mail::root_mail_recipient', 'nobody')
 ) {
 
@@ -37,7 +37,7 @@ class mail::system(
     manage_transport_regexp => "yes",
     manage_virtual_regexp   => "yes",
     manage_header_checks    => "yes",
-    manage_tls_policy       => hiera('mail::postfix_manage_tls_policy', $mail::system::params::postfix_manage_tls_policy)
+    manage_tls_policy       => hiera('mail::postfix_manage_tls_policy', 'no')
   }
 
   # SSL support

diff --git a/manifests/system/params.pp b/manifests/system/params.pp
deleted file mode 100644 (file)
index b5ce4e9..0000000
--- a/manifests/system/params.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class mail::system::params {
-  $postfix_mynetworks        = "127.0.0.0/8"
-  $postfix_manage_tls_policy = 'no'
-}