From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 29 May 2010 23:09:56 +0000 (-0300)
Subject: Don't use exim for mail tunnels
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e980a351f0ff9060d7669fcfbda5c9d6c9890ced;p=puppet-nodo.git

Don't use exim for mail tunnels
---

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index ae49ad4..75c472b 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -32,7 +32,6 @@ class nodo {
   # Email delivery configuration
   case $mail_delivery {
     'tunnel': {              
-      include exim::disabled
       tunnel::mail { "$mail_hostname":
         sshport   => "$mail_ssh_port",
       }
diff --git a/manifests/subsystems/tunnel.pp b/manifests/subsystems/tunnel.pp
index 72c87f8..7bca56f 100644
--- a/manifests/subsystems/tunnel.pp
+++ b/manifests/subsystems/tunnel.pp
@@ -71,7 +71,7 @@ class tunnel {
     tunnel::setup { "smtp":
       host      => "$name.$domain",
       sshport   => "$sshport",
-      localport => '25',
+      localport => '2525',
       hostport  => '25',
     }
   }