aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-21 17:23:19 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-21 17:23:19 -0200
commit6a7a8485a403b67abf6e3e8c61e496b139b88adf (patch)
tree7ae7a566d6a1d8793655c3339c7c161678b55466
parentccba301053aaed7a6c505fbbff53091f816d9928 (diff)
downloadpuppet-nodo-6a7a8485a403b67abf6e3e8c61e496b139b88adf.tar.gz
puppet-nodo-6a7a8485a403b67abf6e3e8c61e496b139b88adf.tar.bz2
Changing mail configuration, including hiera usage
-rw-r--r--manifests/mail.pp13
-rw-r--r--manifests/nodo.pp6
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': { }