From 6a7a8485a403b67abf6e3e8c61e496b139b88adf Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 21 Jan 2013 17:23:19 -0200
Subject: Changing mail configuration, including hiera usage

---
 manifests/mail.pp | 13 -------------
 manifests/nodo.pp |  6 +++---
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/manifests/mail.pp b/manifests/mail.pp
index 58f77dc..d58a505 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -1,17 +1,4 @@
 class nodo::mail {
-  # General configuration
-  $volatile_enabled = true
-  $mail_virtual     = true
-  $mail_delivery    = "postfix"
-
-  # Sympa mailing list manager
-  case $mail_sympa {
-    true,'disabled': {
-      $sympa_subdomain  = "listas"
-      $sympa_lang       = "pt_BR"
-    }
-  }
-
   # Class inclusion
   include nodo::vserver
   include mail::system
diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 0ab3836..0fb8ef9 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -27,10 +27,10 @@ class nodo {
   $ntp_servers  = [ 'a.ntp.br', 'b.ntp.br', 'c.ntp.br' ]
 
   # Email delivery configuration
-  case $mail_delivery {
+  case hiera('mail_delivery', 'exim') {
     'tunnel': {              
-      tunnel::mail { "$mail_hostname":
-        sshport   => "$mail_ssh_port",
+      tunnel::mail { hiera('mail_hostname'):
+        sshport   => hiera('mail_ssh_port'),
       }
     }
     'postfix': { }
-- 
cgit v1.2.3